Rename webrtc/base -> webrtc/rtc_base

NOPRESUBMIT=True # cpplint errors that aren't caused by this CL.
NOTRY=True
NOTREECHECKS=True
TBR=kwiberg@webrtc.org, kjellander@webrtc.org

Bug: webrtc:7634
Change-Id: I3cca0fbaa807b563c95979cccd6d1bec32055f36
Reviewed-on: https://chromium-review.googlesource.com/562156
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18919}

webrtc/api/audio/audio_mixer.h

@@ -13,8 +13,8 @@
 
 #include <memory>
 
-#include "webrtc/base/refcount.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/audio_decoder.cc

@@ -14,10 +14,10 @@
 #include <memory>
 #include <utility>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/sanitizer.h"
-#include "webrtc/base/trace_event.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/sanitizer.h"
+#include "webrtc/rtc_base/trace_event.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/audio_decoder.h

@@ -14,10 +14,10 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/api/audio_codecs/audio_decoder_factory.h

@@ -16,7 +16,7 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/audio_decoder_factory_template.h

@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/audio_encoder.cc

@@ -10,8 +10,8 @@
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/trace_event.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/trace_event.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/audio_encoder.h

@@ -16,10 +16,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/deprecation.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/deprecation.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/api/audio_codecs/audio_encoder_factory.h

@@ -16,7 +16,7 @@
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/audio_encoder_factory_template.h

@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/audio_format.h

@@ -16,7 +16,7 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/builtin_audio_decoder_factory.h

@@ -12,7 +12,7 @@
 #define WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_H_
 
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/builtin_audio_encoder_factory.h

@@ -12,7 +12,7 @@
 #define WEBRTC_API_AUDIO_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_H_
 
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/g722/audio_decoder_g722.cc

@@ -13,10 +13,10 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/safe_conversions.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/g722/audio_decoder_g722.h

@@ -16,7 +16,7 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/g722/audio_encoder_g722.cc

@@ -13,9 +13,9 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/g722/audio_encoder_g722.h

@@ -17,7 +17,7 @@
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.cc

@@ -13,9 +13,9 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
+#include "webrtc/rtc_base/ptr_util.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h

@@ -16,7 +16,7 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.cc

@@ -13,9 +13,9 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 namespace {

webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h

@@ -17,7 +17,7 @@
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/opus/audio_decoder_opus.cc

@@ -14,9 +14,9 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h"
+#include "webrtc/rtc_base/ptr_util.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/opus/audio_decoder_opus.h

@@ -16,7 +16,7 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h

@@ -15,7 +15,7 @@
 
 #include <vector>
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc

@@ -12,7 +12,7 @@
 #include "webrtc/api/audio_codecs/g722/audio_decoder_g722.h"
 #include "webrtc/api/audio_codecs/ilbc/audio_decoder_ilbc.h"
 #include "webrtc/api/audio_codecs/opus/audio_decoder_opus.h"
-#include "webrtc/base/ptr_util.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_decoder.h"

webrtc/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc

@@ -12,7 +12,7 @@
 #include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h"
 #include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc.h"
 #include "webrtc/api/audio_codecs/opus/audio_encoder_opus.h"
-#include "webrtc/base/ptr_util.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_encoder.h"

webrtc/api/datachannelinterface.h

@@ -16,11 +16,10 @@
 
 #include <string>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/refcount.h"
-
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 

webrtc/api/dtmfsenderinterface.h

@@ -14,7 +14,7 @@
 #include <string>
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 

webrtc/api/fakemetricsobserver.cc

@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/api/fakemetricsobserver.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/api/fakemetricsobserver.h

@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 

webrtc/api/jsep.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace cricket {
 class Candidate;

webrtc/api/jsepicecandidate.h

@@ -19,8 +19,8 @@
 #include <vector>
 
 #include "webrtc/api/jsep.h"
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/p2p/base/candidate.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/api/jsepsessiondescription.h

@@ -20,8 +20,8 @@
 
 #include "webrtc/api/jsep.h"
 #include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/p2p/base/candidate.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace cricket {
 class SessionDescription;

webrtc/api/mediaconstraintsinterface.cc

@@ -11,7 +11,7 @@
 #include "webrtc/api/mediaconstraintsinterface.h"
 
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace {
 

webrtc/api/mediaconstraintsinterface.h

@@ -23,8 +23,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/optional.h"
 #include "webrtc/api/peerconnectioninterface.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/mediastreaminterface.h

@@ -23,18 +23,18 @@
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 // TODO(zhihuang): Remove unrelated headers once downstream applications stop
 // relying on them; they were previously transitively included by
 // mediachannel.h, which is no longer a dependency of this file.
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace webrtc {
 

webrtc/api/mediatypes.cc

@@ -11,7 +11,7 @@
 #include "webrtc/api/mediatypes.h"
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace {
 static const char* kMediaTypeData = "data";

webrtc/api/notifier.h

@@ -14,7 +14,7 @@
 #include <list>
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/api/ortc/mediadescription.h

@@ -15,8 +15,8 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/optional.h"
 #include "webrtc/media/base/cryptoparams.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/ortc/ortcfactoryinterface.h

@@ -27,10 +27,10 @@
 #include "webrtc/api/ortc/udptransportinterface.h"
 #include "webrtc/api/rtcerror.h"
 #include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/packetsocketfactory.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 

webrtc/api/ortc/rtptransportinterface.h

@@ -15,7 +15,7 @@
 
 #include "webrtc/api/ortc/packettransportinterface.h"
 #include "webrtc/api/rtcerror.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/ortc/udptransportinterface.h

@@ -13,7 +13,7 @@
 
 #include "webrtc/api/ortc/packettransportinterface.h"
 #include "webrtc/api/proxy.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace webrtc {
 

webrtc/api/peerconnectionfactoryproxy.h

@@ -17,7 +17,7 @@
 
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/proxy.h"
-#include "webrtc/base/bind.h"
+#include "webrtc/rtc_base/bind.h"
 
 namespace webrtc {
 

webrtc/api/peerconnectioninterface.h

@@ -84,17 +84,17 @@
 #include "webrtc/api/stats/rtcstatscollectorcallback.h"
 #include "webrtc/api/statstypes.h"
 #include "webrtc/api/umametrics.h"
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/rtccertificategenerator.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/call/callfactoryinterface.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
 
 namespace rtc {
 class SSLIdentity;

webrtc/api/proxy.h

@@ -55,8 +55,8 @@
 #include <memory>
 #include <utility>
 
-#include "webrtc/base/event.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 

webrtc/api/rtcerror.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/api/rtcerror.h"
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 
 namespace {
 

webrtc/api/rtcerror.h

@@ -15,8 +15,8 @@
 #include <string>
 #include <utility>  // For std::move.
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 

webrtc/api/rtpparameters.h

@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "webrtc/api/mediatypes.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/api/rtpreceiverinterface.h

@@ -17,12 +17,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/api/mediatypes.h"
 #include "webrtc/api/mediastreaminterface.h"
+#include "webrtc/api/mediatypes.h"
 #include "webrtc/api/proxy.h"
 #include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/rtpsenderinterface.h

@@ -18,12 +18,12 @@
 #include <vector>
 
 #include "webrtc/api/dtmfsenderinterface.h"
-#include "webrtc/api/mediatypes.h"
 #include "webrtc/api/mediastreaminterface.h"
+#include "webrtc/api/mediatypes.h"
 #include "webrtc/api/proxy.h"
 #include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/stats/rtcstats.h

@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/api/stats/rtcstatscollectorcallback.h

@@ -12,8 +12,8 @@
 #define WEBRTC_API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
 
 #include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/stats/rtcstatsreport.h

@@ -17,8 +17,8 @@
 #include <vector>
 
 #include "webrtc/api/stats/rtcstats.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/statstypes.cc

@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 // TODO(tommi): Could we have a static map of value name -> expected type
 // and use this to RTC_DCHECK on correct usage (somewhat strongly typed values)?

webrtc/api/statstypes.h

@@ -20,12 +20,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 

webrtc/api/test/fakeconstraints.h

@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace webrtc {
 

webrtc/api/umametrics.h

@@ -13,7 +13,7 @@
 #ifndef WEBRTC_API_UMAMETRICS_H_
 #define WEBRTC_API_UMAMETRICS_H_
 
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 

webrtc/api/video/i420_buffer.cc

@@ -14,11 +14,11 @@
 #include <algorithm>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
 #include "libyuv/convert.h"
 #include "libyuv/planar_functions.h"
 #include "libyuv/scale.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/keep_ref_until_done.h"
 
 // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD.
 static const int kBufferAlignment = 64;

webrtc/api/video/video_frame.cc

@@ -10,8 +10,8 @@
 
 #include "webrtc/api/video/video_frame.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace webrtc {
 

webrtc/api/video/video_frame_buffer.cc

@@ -12,7 +12,7 @@
 
 #include "libyuv/convert.h"
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/api/video/video_frame_buffer.h

@@ -13,8 +13,8 @@
 
 #include <stdint.h>
 
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/api/video/video_timing.h

@@ -15,8 +15,8 @@
 
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

webrtc/api/video_codecs/video_encoder.h

@@ -16,11 +16,11 @@
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_frame.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
-#include "webrtc/base/optional.h"
 
 namespace webrtc {
 

webrtc/audio/audio_receive_stream.cc

@@ -17,13 +17,13 @@
 #include "webrtc/audio/audio_send_stream.h"
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/conversion.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"

webrtc/audio/audio_receive_stream.h

@@ -16,11 +16,11 @@
 
 #include "webrtc/api/audio/audio_mixer.h"
 #include "webrtc/audio/audio_state.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/audio_receive_stream.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/call/syncable.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 class PacketRouter;

webrtc/audio/audio_send_stream.cc

@@ -17,17 +17,17 @@
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/conversion.h"
 #include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/function_view.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
 #include "webrtc/modules/pacing/paced_sender.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/function_view.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 #include "webrtc/voice_engine/transmit_mixer.h"

webrtc/audio/audio_send_stream.h

@@ -14,12 +14,12 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/audio_send_stream.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/bitrate_allocator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
 
 namespace webrtc {

webrtc/audio/audio_send_stream_unittest.cc

@@ -15,8 +15,6 @@
 #include "webrtc/audio/audio_send_stream.h"
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/conversion.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/task_queue.h"
 #include "webrtc/call/fake_rtp_transport_controller_send.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
@@ -27,6 +25,8 @@
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h"
 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/task_queue.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_encoder.h"
 #include "webrtc/test/mock_audio_encoder_factory.h"

webrtc/audio/audio_state.cc

@@ -10,10 +10,10 @@
 
 #include "webrtc/audio/audio_state.h"
 
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 
 namespace webrtc {

webrtc/audio/audio_state.h

@@ -13,10 +13,10 @@
 
 #include "webrtc/audio/audio_transport_proxy.h"
 #include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/audio_state.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 
 namespace webrtc {

webrtc/audio/audio_transport_proxy.h

@@ -12,11 +12,11 @@
 #define WEBRTC_AUDIO_AUDIO_TRANSPORT_PROXY_H_
 
 #include "webrtc/api/audio/audio_mixer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/modules/audio_device/include/audio_device_defines.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/audio/scoped_voe_interface.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_
 #define WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/audio/utility/audio_frame_operations.cc

@@ -12,9 +12,9 @@
 
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 namespace {

webrtc/audio/utility/audio_frame_operations_unittest.cc

@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {

webrtc/call/audio_receive_stream.h

@@ -19,10 +19,10 @@
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
 #include "webrtc/api/call/transport.h"
 #include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/call/audio_send_stream.h

@@ -18,8 +18,8 @@
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/api/call/transport.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/call/audio_state.h

@@ -11,8 +11,8 @@
 #define WEBRTC_CALL_AUDIO_STATE_H_
 
 #include "webrtc/api/audio/audio_mixer.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/call/bitrate_allocator.cc

@@ -14,9 +14,9 @@
 #include <algorithm>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 

webrtc/call/bitrate_allocator.h

@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
 
 namespace webrtc {
 

webrtc/call/bitrate_estimator_tests.cc

@@ -12,11 +12,11 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/call/call.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/direct_transport.h"
 #include "webrtc/test/encoder_settings.h"

webrtc/call/call.cc

@@ -20,17 +20,6 @@
 #include "webrtc/audio/audio_send_stream.h"
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/call/bitrate_allocator.h"
 #include "webrtc/call/call.h"
 #include "webrtc/call/flexfec_receive_stream_impl.h"
@@ -47,6 +36,17 @@
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/cpu_info.h"
 #include "webrtc/system_wrappers/include/metrics.h"

webrtc/call/call.h

@@ -16,15 +16,15 @@
 #include <vector>
 
 #include "webrtc/api/rtcerror.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/platform_file.h"
-#include "webrtc/base/socket.h"
 #include "webrtc/call/audio_receive_stream.h"
 #include "webrtc/call/audio_send_stream.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/flexfec_receive_stream.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/rtc_base/socket.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 

webrtc/call/call_perf_tests.cc

@@ -14,15 +14,15 @@
 #include <string>
 
 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/call/call.h"
 #include "webrtc/config.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/direct_transport.h"

webrtc/call/call_unittest.cc

@@ -14,7 +14,6 @@
 #include <utility>
 
 #include "webrtc/api/test/mock_audio_mixer.h"
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/call.h"
 #include "webrtc/call/fake_rtp_transport_controller_send.h"
@@ -23,6 +22,7 @@
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
 #include "webrtc/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_decoder_factory.h"
 #include "webrtc/test/mock_transport.h"

webrtc/call/flexfec_receive_stream_impl.cc

@@ -12,15 +12,15 @@
 
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {

webrtc/call/flexfec_receive_stream_impl.h

@@ -13,9 +13,9 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/call/flexfec_receive_stream.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 namespace webrtc {
 

webrtc/call/flexfec_receive_stream_unittest.cc

@@ -13,7 +13,6 @@
 #include <stdint.h>
 #include <memory>
 
-#include "webrtc/base/array_view.h"
 #include "webrtc/call/rtp_stream_receiver_controller.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
@@ -22,6 +21,7 @@
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/utility/include/mock/mock_process_thread.h"
+#include "webrtc/rtc_base/array_view.h"
 #include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"

webrtc/call/rampup_tests.cc

@@ -10,9 +10,9 @@
 
 #include "webrtc/call/rampup_tests.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/test/encoder_settings.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/perf_test.h"

webrtc/call/rampup_tests.h

@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/event.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/rtc_base/event.h"
 #include "webrtc/test/call_test.h"
 
 namespace webrtc {

webrtc/call/rsid_resolution_observer.h

@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "webrtc/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
 
 namespace webrtc {
 

webrtc/call/rtcp_demuxer.cc

@@ -10,10 +10,10 @@
 
 #include "webrtc/call/rtcp_demuxer.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/call/rtcp_packet_sink_interface.h"
 #include "webrtc/call/rtp_rtcp_demuxer_helper.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/call/rtcp_demuxer.h

@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/call/rsid_resolution_observer.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/basictypes.h"
 
 namespace webrtc {
 

webrtc/call/rtcp_demuxer_unittest.cc

@@ -12,13 +12,13 @@
 
 #include <memory>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/call/rtcp_packet_sink_interface.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 

webrtc/call/rtcp_packet_sink_interface.h

@@ -10,7 +10,7 @@
 #ifndef WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_
 #define WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_
 
-#include "webrtc/base/array_view.h"
+#include "webrtc/rtc_base/array_view.h"
 
 namespace webrtc {
 

webrtc/call/rtp_demuxer.cc

@@ -10,13 +10,13 @@
 
 #include "webrtc/call/rtp_demuxer.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/call/rsid_resolution_observer.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/call/rtp_rtcp_demuxer_helper.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 

webrtc/call/rtp_demuxer_unittest.cc

@@ -13,16 +13,16 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/call/rsid_resolution_observer.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 

webrtc/call/rtp_rtcp_demuxer_helper.h

@@ -15,9 +15,9 @@
 #include <map>
 #include <utility>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc

@@ -12,9 +12,6 @@
 
 #include "webrtc/call/rtp_rtcp_demuxer_helper.h"
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/buffer.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
@@ -22,6 +19,9 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/buffer.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {

webrtc/call/rtp_stream_receiver_controller.cc

@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/call/rtp_stream_receiver_controller.h"
-#include "webrtc/base/ptr_util.h"
+#include "webrtc/rtc_base/ptr_util.h"
 
 namespace webrtc {
 

webrtc/call/rtp_stream_receiver_controller.h

@@ -12,9 +12,9 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/call/rtp_demuxer.h"
 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 namespace webrtc {
 

webrtc/call/rtp_transport_controller_send.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_
 #define WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 class Clock;