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

This reverts commit c8fa692ec44fd6ba4fa3d085ac3161a262fc18c5.

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

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

webrtc/modules/audio_coding/neteq/tools/audio_checksum.h

@@ -13,10 +13,10 @@
 
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/md5digest.h"
+#include "webrtc/base/stringencode.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/md5digest.h"
-#include "webrtc/rtc_base/stringencode.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/audio_loop.h

@@ -14,8 +14,8 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/audio_sink.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_
 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc

@@ -12,9 +12,9 @@
 
 #include <algorithm>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
-#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h

@@ -14,9 +14,9 @@
 #include <stdio.h>
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.cc

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

webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.cc

@@ -10,9 +10,9 @@
 
 #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h"
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h

@@ -14,9 +14,9 @@
 #include <memory>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/input_audio_file.h

@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.cc

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

webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h

@@ -16,9 +16,9 @@
 #include <string>
 #include <vector>
 
+#include "webrtc/base/optional.h"
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_input.h"
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h"
-#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc

@@ -12,7 +12,7 @@
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h"
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/base/format_macros.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/neteq_input.h

@@ -15,11 +15,11 @@
 #include <memory>
 #include <string>
 
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/neteq_packet_source_input.cc

@@ -13,9 +13,9 @@
 #include <algorithm>
 #include <limits>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
-#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc

@@ -11,13 +11,13 @@
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h"
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/typedefs.h"

webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc

@@ -12,11 +12,11 @@
 #include <stdio.h>
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h"
 #include "webrtc/modules/audio_coding/neteq/tools/output_audio_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h"
-#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.cc

@@ -10,8 +10,8 @@
 
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h"
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h"
-#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc

@@ -22,6 +22,7 @@
 #include <string>
 
 #include "gflags/gflags.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
 #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
@@ -33,7 +34,6 @@
 #include "webrtc/modules/audio_coding/neteq/tools/output_wav_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/typedefs.h"
 

webrtc/modules/audio_coding/neteq/tools/output_audio_file.h

@@ -15,8 +15,8 @@
 #include <stdio.h>
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/output_wav_file.h

@@ -13,9 +13,9 @@
 
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/wav_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/packet.cc

@@ -14,9 +14,9 @@
 
 #include <memory>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/packet.h

@@ -14,8 +14,8 @@
 #include <list>
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/packet_source.h

@@ -14,8 +14,8 @@
 #include <bitset>
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.cc

@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h

@@ -13,9 +13,9 @@
 
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/resampler/include/resampler.h"
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.cc

@@ -15,10 +15,11 @@
 #include <iostream>
 #include <limits>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/call/call.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/rtc_base/checks.h"
+
 
 namespace webrtc {
 namespace test {

webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h

@@ -14,10 +14,10 @@
 #include <memory>
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc

@@ -20,9 +20,9 @@
 
 #include <memory>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/rtp_file_reader.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h

@@ -16,10 +16,10 @@
 #include <memory>
 #include <string>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/neteq/tools/rtp_generator.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/tools/rtpcat.cc

@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/test/rtp_file_reader.h"
 #include "webrtc/test/rtp_file_writer.h"