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

This reverts commit c3771cc4d37f5573fe53b7c7cff295a4f0f9560f.
(breaks downstream internal project)

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

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

webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h

@@ -13,12 +13,12 @@
 #define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_ENCODER_H_
 
 #include "webrtc/api/video/video_rotation.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/common_video/include/bitrate_adjuster.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
-#include "webrtc/rtc_base/criticalsection.h"
 
 #include <VideoToolbox/VideoToolbox.h>
 #include <vector>

webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc

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

webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h

@@ -17,9 +17,9 @@
 #include <CoreMedia/CoreMedia.h>
 #include <vector>
 
+#include "webrtc/base/buffer.h"
 #include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/buffer.h"
 
 using webrtc::H264::NaluIndex;
 

webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc

@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/base/arraysize.h"
 #include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h"
 #include "webrtc/test/gtest.h"