#include "webrtc/base/constructormagic.h" where appropriate

Any file that uses the RTC_DISALLOW_* macros should #include
"webrtc/base/constructormagic.h", but a shocking number of them don't.
This causes trouble when we try to wean files off of #including
scoped_ptr.h, since a bunch of files get their constructormagic macros
only from there.

Rather than fixing these errors one by one as they turn up, this CL
simply ensures that every file in the WebRTC tree that uses the
RTC_DISALLOW_* macros #includes "webrtc/base/constructormagic.h".

BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1917043005

Cr-Commit-Position: refs/heads/master@{#12509}

webrtc/api/audiotrack.h

@@ -16,6 +16,7 @@
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/mediastreamtrack.h"
 #include "webrtc/api/notifier.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/thread_checker.h"

webrtc/api/dtmfsender.h

@@ -17,6 +17,7 @@
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/proxy.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/refcount.h"
 

webrtc/api/java/jni/androidvideocapturer_jni.h

@@ -16,6 +16,7 @@
 #include "webrtc/api/androidvideocapturer.h"
 #include "webrtc/api/java/jni/jni_helpers.h"
 #include "webrtc/base/asyncinvoker.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"

webrtc/api/jsepsessiondescription.h

@@ -18,6 +18,7 @@
 
 #include "webrtc/api/jsep.h"
 #include "webrtc/api/jsepicecandidate.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/p2p/base/candidate.h"
 

webrtc/api/mediacontroller.cc

@@ -12,6 +12,7 @@
 
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/call.h"
 #include "webrtc/pc/channelmanager.h"
 #include "webrtc/media/base/mediachannel.h"

webrtc/api/remoteaudiosource.cc

@@ -16,6 +16,7 @@
 
 #include "webrtc/api/mediastreamprovider.h"
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 

webrtc/api/statstypes.h

@@ -21,6 +21,7 @@
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/linked_ptr.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ptr.h"

webrtc/api/webrtcsession.h

@@ -22,6 +22,7 @@
 #include "webrtc/api/mediastreamprovider.h"
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/statstypes.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/thread.h"

webrtc/api/webrtcsessiondescriptionfactory.h

@@ -15,6 +15,7 @@
 
 #include "webrtc/api/dtlsidentitystore.h"
 #include "webrtc/api/peerconnectioninterface.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/rtccertificate.h"
 #include "webrtc/p2p/base/transportdescriptionfactory.h"

webrtc/audio/audio_receive_stream.h

@@ -15,6 +15,7 @@
 
 #include "webrtc/audio_receive_stream.h"
 #include "webrtc/audio_state.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 

webrtc/audio/audio_send_stream.h

@@ -15,6 +15,7 @@
 
 #include "webrtc/audio_send_stream.h"
 #include "webrtc/audio_state.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread_checker.h"
 
 namespace webrtc {

webrtc/base/asyncinvoker.h

@@ -13,6 +13,7 @@
 
 #include "webrtc/base/asyncinvoker-inl.h"
 #include "webrtc/base/bind.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/scopedptrcollection.h"
 #include "webrtc/base/thread.h"

webrtc/base/asyncpacketsocket.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_BASE_ASYNCPACKETSOCKET_H_
 #define WEBRTC_BASE_ASYNCPACKETSOCKET_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socket.h"

webrtc/base/asynctcpsocket.h

@@ -15,6 +15,7 @@
 
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/socketfactory.h"
 
 namespace rtc {

webrtc/base/bufferqueue.h

@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 
 namespace rtc {

webrtc/base/fileutils.h

@@ -23,6 +23,7 @@
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/platform_file.h"
 
 namespace rtc {

webrtc/base/flags.h

@@ -27,6 +27,7 @@
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace rtc {
 

webrtc/base/latebindingsymboltable.h

@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace rtc {
 

webrtc/base/macasyncsocket.h

@@ -19,6 +19,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/nethelpers.h"
 
 namespace rtc {

webrtc/base/maccocoasocketserver.h

@@ -13,6 +13,7 @@
 #ifndef WEBRTC_BASE_MACCOCOASOCKETSERVER_H_
 #define WEBRTC_BASE_MACCOCOASOCKETSERVER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/macsocketserver.h"
 
 #ifdef __OBJC__

webrtc/base/multipart.h

@@ -14,6 +14,7 @@
 #include <string>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/stream.h"
 

webrtc/base/natserver.h

@@ -15,6 +15,7 @@
 #include <set>
 
 #include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/socketaddresspair.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/socketfactory.h"

webrtc/base/natsocketfactory.h

@@ -16,6 +16,7 @@
 #include <memory>
 #include <set>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/natserver.h"
 #include "webrtc/base/socketaddress.h"
 #include "webrtc/base/socketserver.h"

webrtc/base/opensslidentity.h

@@ -18,6 +18,7 @@
 #include <string>
 
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/sslidentity.h"
 
 typedef struct ssl_ctx_st SSL_CTX;

webrtc/base/profiler.h

@@ -36,6 +36,7 @@
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/sharedexclusivelock.h"
 

webrtc/base/proxyserver.h

@@ -14,6 +14,7 @@
 #include <list>
 #include <memory>
 #include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/socketadapters.h"
 #include "webrtc/base/socketaddress.h"
 #include "webrtc/base/stream.h"

webrtc/base/referencecountedsingletonfactory.h

@@ -14,6 +14,7 @@
 #include <memory>
 
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/logging.h"
 

webrtc/base/rollingaccumulator.h

@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace rtc {
 

webrtc/base/scoped_autorelease_pool.h

@@ -23,6 +23,7 @@
 #if defined(WEBRTC_MAC)
 
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 
 // This header may be included from Obj-C files or C++ files.
 #ifdef __OBJC__

webrtc/base/scopedptrcollection_unittest.cc

@@ -10,6 +10,7 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scopedptrcollection.h"
 #include "webrtc/base/gunit.h"
 

webrtc/base/signalthread_unittest.cc

@@ -10,6 +10,7 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/signalthread.h"
 #include "webrtc/base/thread.h"

webrtc/base/socketadapters.h

@@ -15,6 +15,7 @@
 #include <string>
 
 #include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/cryptstring.h"
 #include "webrtc/base/logging.h"
 

webrtc/base/socketstream.h

@@ -13,6 +13,7 @@
 
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/stream.h"
 
 namespace rtc {

webrtc/base/sslidentity.h

@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/messagedigest.h"
 #include "webrtc/base/timeutils.h"
 

webrtc/base/stream.h

@@ -16,6 +16,7 @@
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/messagehandler.h"

webrtc/base/swap_queue.h

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 
 namespace webrtc {

webrtc/base/task_unittest.cc

@@ -22,6 +22,7 @@
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/task.h"

webrtc/base/testclient.h

@@ -13,6 +13,7 @@
 
 #include <vector>
 #include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 
 namespace rtc {

webrtc/base/testechoserver.h

@@ -14,6 +14,7 @@
 #include <list>
 #include <memory>
 #include "webrtc/base/asynctcpsocket.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/socketaddress.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"

webrtc/base/thread_checker_unittest.cc

@@ -14,6 +14,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/thread_checker.h"
 

webrtc/base/virtualsocketserver.h

@@ -16,6 +16,7 @@
 #include <deque>
 #include <map>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/socketserver.h"
 

webrtc/call/call.cc

@@ -19,6 +19,7 @@
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/scoped_voe_interface.h"
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/thread_checker.h"

webrtc/call/ringbuffer.h

@@ -16,6 +16,7 @@
 #include <utility>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/common.h

@@ -14,6 +14,7 @@
 #include <map>
 
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/libjingle/xmpp/pubsubstateclient.h

@@ -20,6 +20,7 @@
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/jid.h"
 #include "webrtc/libjingle/xmpp/pubsubclient.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sigslotrepeater.h"

webrtc/libjingle/xmpp/xmpptask.h

@@ -14,6 +14,7 @@
 #include <deque>
 #include <string>
 #include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/task.h"
 #include "webrtc/base/taskparent.h"

webrtc/media/base/rtpdump.h

@@ -18,6 +18,7 @@
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/bytebuffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/stream.h"
 
 namespace cricket {

webrtc/media/base/videoadapter.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
 #define WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/media/base/videocommon.h"

webrtc/media/base/videocapturer.h

@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/media/base/videosourceinterface.h"
 #include "webrtc/base/sigslot.h"

webrtc/media/engine/webrtcvoiceengine.cc

@@ -22,6 +22,7 @@
 #include "webrtc/base/base64.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"

webrtc/media/engine/webrtcvoiceengine.h

@@ -18,6 +18,7 @@
 
 #include "webrtc/audio_state.h"
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/networkroute.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/stream.h"

webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/vad/mock/mock_vad.h"
 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"

webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h

@@ -12,6 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 
 typedef struct WebRtcG722DecInst G722DecInst;

webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h

@@ -14,6 +14,7 @@
 #include <memory>
 
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
 

webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 
 typedef struct iLBC_decinst_t_ IlbcDecoderInstance;

webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h

@@ -13,6 +13,7 @@
 
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"

webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h

@@ -13,6 +13,7 @@
 
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"

webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
 

webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h

@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 
 namespace webrtc {

webrtc/modules/audio_processing/aec/aec_core_internal.h

@@ -14,6 +14,7 @@
 extern "C" {
 #include "webrtc/common_audio/ring_buffer.h"
 }
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/wav_file.h"
 #include "webrtc/modules/audio_processing/aec/aec_common.h"
 #include "webrtc/modules/audio_processing/aec/aec_core.h"

webrtc/modules/audio_processing/echo_control_mobile_impl.cc

@@ -12,6 +12,7 @@
 
 #include <string.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
 #include "webrtc/system_wrappers/include/logging.h"

webrtc/modules/audio_processing/gain_control_impl.cc

@@ -10,6 +10,7 @@
 
 #include "webrtc/modules/audio_processing/gain_control_impl.h"
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
 #include "webrtc/modules/audio_processing/agc/legacy/gain_control.h"

webrtc/modules/audio_processing/noise_suppression_impl.cc

@@ -10,6 +10,7 @@
 
 #include "webrtc/modules/audio_processing/noise_suppression_impl.h"
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
 #if defined(WEBRTC_NS_FLOAT)
 #include "webrtc/modules/audio_processing/ns/noise_suppression.h"

webrtc/modules/audio_processing/voice_detection_impl.cc

@@ -10,6 +10,7 @@
 
 #include "webrtc/modules/audio_processing/voice_detection_impl.h"
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/vad/include/webrtc_vad.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
 

webrtc/modules/bitrate_controller/bitrate_controller_impl.h

@@ -20,6 +20,7 @@
 #include <list>
 #include <utility>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
 

webrtc/modules/congestion_controller/congestion_controller.cc

@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/thread_annotations.h"

webrtc/modules/congestion_controller/include/congestion_controller.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_
 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/include/module_common_types.h"

webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h

@@ -12,6 +12,7 @@
 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_CONTROLLER_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/modules/congestion_controller/include/congestion_controller.h"
 

webrtc/modules/desktop_capture/cropped_desktop_frame.cc

@@ -12,6 +12,8 @@
 
 #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h"
 
+#include "webrtc/base/constructormagic.h"
+
 namespace webrtc {
 
 // A DesktopFrame that is a sub-rect of another DesktopFrame.

webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc

@@ -12,6 +12,7 @@
 
 #include <string.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 #include "webrtc/modules/desktop_capture/mouse_cursor.h"

webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

@@ -13,6 +13,7 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"

webrtc/modules/desktop_capture/desktop_frame.h

@@ -13,6 +13,7 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "webrtc/modules/desktop_capture/desktop_region.h"
 #include "webrtc/modules/desktop_capture/shared_memory.h"

webrtc/modules/desktop_capture/desktop_frame_win.h

@@ -15,6 +15,7 @@
 
 #include <windows.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 #include "webrtc/typedefs.h"
 

webrtc/modules/desktop_capture/differ.h

@@ -14,6 +14,7 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_region.h"
 
 namespace webrtc {

webrtc/modules/desktop_capture/differ_unittest.cc

@@ -11,6 +11,7 @@
 #include <memory>
 
 #include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/differ.h"
 #include "webrtc/modules/desktop_capture/differ_block.h"
 

webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h

@@ -16,6 +16,7 @@
 #include <memory>
 #include <set>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 

webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h

@@ -13,6 +13,7 @@
 
 #include <ApplicationServices/ApplicationServices.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/window_capturer.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 #include "webrtc/system_wrappers/include/tick_util.h"

webrtc/modules/desktop_capture/screen_capturer_helper.h

@@ -13,6 +13,7 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "webrtc/modules/desktop_capture/desktop_region.h"
 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"

webrtc/modules/desktop_capture/screen_capturer_mac.mm

@@ -23,6 +23,7 @@
 #include <OpenGL/OpenGL.h>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/macutils.h"
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"

webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

@@ -12,6 +12,7 @@
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_MOCK_OBJECTS_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/screen_capturer.h"
 
 namespace webrtc {

webrtc/modules/desktop_capture/screen_capturer_unittest.cc

@@ -14,6 +14,7 @@
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 #include "webrtc/modules/desktop_capture/desktop_region.h"

webrtc/modules/desktop_capture/screen_capturer_x11.cc

@@ -21,6 +21,7 @@
 #include <X11/Xutil.h>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 #include "webrtc/modules/desktop_capture/differ.h"

webrtc/modules/desktop_capture/shared_desktop_frame.cc

@@ -12,6 +12,7 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 
 namespace webrtc {

webrtc/modules/desktop_capture/shared_desktop_frame.h

@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 

webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h

@@ -17,6 +17,7 @@
 
 #include <windows.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h"

webrtc/modules/desktop_capture/win/window_capture_utils.h

@@ -10,6 +10,7 @@
 
 #include <windows.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace webrtc {

webrtc/modules/desktop_capture/window_capturer_mac.mm

@@ -15,6 +15,7 @@
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CoreFoundation.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/macutils.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"

webrtc/modules/desktop_capture/window_capturer_null.cc

@@ -12,6 +12,7 @@
 
 #include <assert.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace webrtc {

webrtc/modules/desktop_capture/window_capturer_win.cc

@@ -15,6 +15,7 @@
 #include <memory>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/win32.h"
 #include "webrtc/modules/desktop_capture/desktop_frame_win.h"
 #include "webrtc/modules/desktop_capture/win/window_capture_utils.h"

webrtc/modules/desktop_capture/window_capturer_x11.cc

@@ -19,6 +19,7 @@
 
 #include <algorithm>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "webrtc/modules/desktop_capture/desktop_frame.h"

webrtc/modules/desktop_capture/x11/shared_x_display.h

@@ -19,6 +19,7 @@
 
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 

webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h

@@ -13,6 +13,7 @@
 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
 
 #include <X11/Xutil.h>

webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc

@@ -11,6 +11,7 @@
 #include <memory>
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h

@@ -17,6 +17,7 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/rate_statistics.h"
 #include "webrtc/base/thread_checker.h"

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

@@ -15,6 +15,7 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/rate_statistics.h"
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc

@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <sstream>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/random.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"

webrtc/modules/remote_bitrate_estimator/test/bwe.cc

@@ -13,6 +13,7 @@
 #include <limits>
 
 #include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h"

webrtc/modules/remote_bitrate_estimator/test/bwe.h

@@ -16,6 +16,7 @@
 #include <sstream>
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"