Update includes for webrtc/{base => rtc_base} rename (2/3)

I used a command like this to update the paths:
perl -pi -e "s/webrtc\/base/webrtc\/rtc_base/g" `find webrtc/rtc_base -name "*.cc" -o -name "*.h"`

BUG=webrtc:7634
NOPRESUBMIT=True # cpplint errors that aren't caused by this CL.

Review-Url: https://codereview.webrtc.org/2969623003
Cr-Commit-Position: refs/heads/master@{#18870}

webrtc/sdk/android/src/jni/androidmediacodeccommon.h

@@ -14,11 +14,10 @@
 #include <android/log.h>
 #include <string>
 
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

@@ -20,16 +20,16 @@
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"

webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

@@ -22,15 +22,6 @@
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/weak_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/common_video/h264/h264_common.h"
@@ -40,6 +31,15 @@
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
 #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/weak_ptr.h"
 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"

webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc

@@ -14,11 +14,11 @@
 // This was added in Lollipop to dlfcn.h
 #define RTLD_NOLOAD 4
 
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ipaddress.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ipaddress.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h

@@ -11,14 +11,14 @@
 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
 
-#include "webrtc/base/networkmonitor.h"
+#include "webrtc/rtc_base/networkmonitor.h"
 
 #include <stdint.h>
 
 #include <map>
 
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/thread_checker.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/androidvideotracksource.cc

@@ -12,7 +12,7 @@
 
 #include <utility>
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace {
 // MediaCodec wants resolution to be divisible by 2.

webrtc/sdk/android/src/jni/androidvideotracksource.h

@@ -11,15 +11,15 @@
 #ifndef WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
 #define WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
 
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timestampaligner.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/media/base/adaptedvideotracksource.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timestampaligner.h"
+#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 
 namespace webrtc {
 

webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/api/video/video_rotation.h"
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 

webrtc/sdk/android/src/jni/audio_jni.h

@@ -15,7 +15,7 @@
 // We don't want this target depend on audio related targets
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"  // nogncheck
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"  // nogncheck
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/filevideocapturer_jni.cc

@@ -11,8 +11,8 @@
 #include <jni.h>
 
 #include "third_party/libyuv/include/libyuv/convert_from.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/jni_helpers.h

@@ -17,9 +17,9 @@
 #include <jni.h>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 // Abort the process if |jni| has a Java exception pending.
 // This macros uses the comma operator to execute ExceptionDescribe

webrtc/sdk/android/src/jni/jni_onload.cc

@@ -12,9 +12,9 @@
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__((visibility("default")))
 
+#include "webrtc/rtc_base/ssladapter.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/ssladapter.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/media_jni.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_
 
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 class AudioDeviceModule;

webrtc/sdk/android/src/jni/native_handle_impl.cc

@@ -12,13 +12,13 @@
 
 #include <memory>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/keep_ref_until_done.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/system_wrappers/include/aligned_malloc.h"

webrtc/sdk/android/src/jni/native_handle_impl.h

@@ -16,7 +16,7 @@
 #include "webrtc/api/video/video_frame.h"
 #include "webrtc/api/video/video_frame_buffer.h"
 #include "webrtc/api/video/video_rotation.h"
-#include "webrtc/base/callback.h"
+#include "webrtc/rtc_base/callback.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc_jni {

webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 

webrtc/sdk/android/src/jni/ownedfactoryandthreads.h

@@ -16,7 +16,7 @@
 #include <utility>
 
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
 
 using cricket::WebRtcVideoDecoderFactory;
 using cricket::WebRtcVideoEncoderFactory;

webrtc/sdk/android/src/jni/peerconnection_jni.cc

@@ -48,20 +48,20 @@
 #include "webrtc/api/rtpreceiverinterface.h"
 #include "webrtc/api/rtpsenderinterface.h"
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event_tracer.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/logsinks.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/networkmonitor.h"
-#include "webrtc/base/rtccertificategenerator.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/modules/utility/include/jvm_android.h"
 #include "webrtc/pc/webrtcsdp.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event_tracer.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/logsinks.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/networkmonitor.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h"
 // Adding 'nogncheck' to disable the gn include headers check.
 // We don't want to always depend on audio and video related targets.
@@ -1130,8 +1130,8 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)
   // talk/ assumes pretty widely that the current Thread is ThreadManager'd, but
   // ThreadManager only WrapCurrentThread()s the thread where it is first
   // created.  Since the semantics around when auto-wrapping happens in
-  // webrtc/base/ are convoluted, we simply wrap here to avoid having to think
-  // about ramifications of auto-wrapping there.
+  // webrtc/rtc_base/ are convoluted, we simply wrap here to avoid having to
+  // think about ramifications of auto-wrapping there.
   rtc::ThreadManager::Instance()->WrapCurrentThread();
   webrtc::Trace::CreateTrace();
 

webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc

@@ -11,10 +11,10 @@
 
 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h

@@ -13,11 +13,11 @@
 
 #include <jni.h>
 
+#include "webrtc/api/video/video_frame_buffer.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/video_jni.cc

@@ -11,9 +11,9 @@
 #include <jni.h>
 
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"

webrtc/sdk/android/src/jni/video_jni.h

@@ -13,7 +13,7 @@
 
 #include <jni.h>
 
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace cricket {
 class WebRtcVideoEncoderFactory;

webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc

@@ -11,8 +11,8 @@
 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
 
 #include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
 
 namespace webrtc_jni {

webrtc/sdk/android/src/jni/videodecoderwrapper.cc

@@ -11,8 +11,8 @@
 #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 
 namespace webrtc_jni {

webrtc/sdk/android/src/jni/videofilerenderer_jni.cc

@@ -11,8 +11,8 @@
 #include <jni.h>
 
 #include "third_party/libyuv/include/libyuv/scale.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc_jni {
 

webrtc/sdk/android/src/jni/videotrack_jni.cc

@@ -11,7 +11,7 @@
 #include <jni.h>
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc_jni {