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

This reverts commit https://codereview.webrtc.org/2963273002/
where the git cl format breaks include order on Windows.

BUG=webrtc:7634
NOTRY=True
TBR=kwiberg@webrtc.org

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

webrtc/rtc_base/array_view.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_RTC_BASE_ARRAY_VIEW_H_
 #define WEBRTC_RTC_BASE_ARRAY_VIEW_H_
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/type_traits.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/type_traits.h"
 
 namespace rtc {
 

webrtc/rtc_base/array_view_unittest.cc

@@ -12,10 +12,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/gunit.h"
 #include "webrtc/test/gmock.h"
 
 namespace rtc {

webrtc/rtc_base/asyncinvoker-inl.h

@@ -11,13 +11,13 @@
 #ifndef WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_
 #define WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_
 
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/base/atomicops.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/thread_annotations.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncinvoker.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/base/asyncinvoker.h"
 
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/atomicops.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncinvoker.h

@@ -14,12 +14,12 @@
 #include <memory>
 #include <utility>
 
-#include "webrtc/rtc_base/asyncinvoker-inl.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/asyncinvoker-inl.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/thread.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncpacketsocket.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/base/asyncpacketsocket.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncpacketsocket.h

@@ -11,11 +11,11 @@
 #ifndef WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_
 #define WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_
 
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/dscp.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/socket.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/dscp.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/socket.h"
+#include "webrtc/base/timeutils.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncresolverinterface.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/asyncresolverinterface.h"
+#include "webrtc/base/asyncresolverinterface.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncresolverinterface.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_
 #define WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_
 
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/socketaddress.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncsocket.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/checks.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncsocket.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_RTC_BASE_ASYNCSOCKET_H_
 #define WEBRTC_RTC_BASE_ASYNCSOCKET_H_
 
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/socket.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/socket.h"
 
 namespace rtc {
 

webrtc/rtc_base/asynctcpsocket.cc

@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/base/asynctcpsocket.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 #if defined(WEBRTC_POSIX)
 #include <errno.h>

webrtc/rtc_base/asynctcpsocket.h

@@ -13,10 +13,10 @@
 
 #include <memory>
 
-#include "webrtc/rtc_base/asyncpacketsocket.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/socketfactory.h"
+#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/socketfactory.h"
 
 namespace rtc {
 

webrtc/rtc_base/asynctcpsocket_unittest.cc

@@ -11,9 +11,9 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/rtc_base/asynctcpsocket.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/asynctcpsocket.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/virtualsocketserver.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncudpsocket.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/asyncudpsocket.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncudpsocket.h

@@ -13,8 +13,8 @@
 
 #include <memory>
 
-#include "webrtc/rtc_base/asyncpacketsocket.h"
-#include "webrtc/rtc_base/socketfactory.h"
+#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/base/socketfactory.h"
 
 namespace rtc {
 

webrtc/rtc_base/asyncudpsocket_unittest.cc

@@ -11,10 +11,10 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/rtc_base/asyncudpsocket.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/physicalsocketserver.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/virtualsocketserver.h"
 
 namespace rtc {
 

webrtc/rtc_base/atomicops_unittest.cc

@@ -9,4 +9,4 @@
  */
 
 // TODO(pbos): Move AtomicOps tests to here from
-// webrtc/rtc_base/criticalsection_unittest.cc.
+// webrtc/base/criticalsection_unittest.cc.

webrtc/rtc_base/base64.cc

@@ -14,11 +14,11 @@
 //*
 //*********************************************************************
 
-#include "webrtc/rtc_base/base64.h"
+#include "webrtc/base/base64.h"
 
 #include <string.h>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 using std::vector;
 

webrtc/rtc_base/base64_unittest.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/base64.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/stringutils.h"
 
-#include "webrtc/rtc_base/testbase64.h"
+#include "webrtc/base/testbase64.h"
 
 using namespace std;
 using namespace rtc;

webrtc/rtc_base/basictypes_unittest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/base/basictypes.h"
 
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/bind.h

@@ -64,8 +64,8 @@
 #include <tuple>
 #include <type_traits>
 
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/template_util.h"
+#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/base/template_util.h"
 
 #define NONAME
 

webrtc/rtc_base/bind_unittest.cc

@@ -10,10 +10,10 @@
 
 #include <type_traits>
 
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/gunit.h"
 
-#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/base/refcount.h"
 
 namespace rtc {
 

webrtc/rtc_base/bitbuffer.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/base/bitbuffer.h"
 
 #include <algorithm>
 #include <limits>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace {
 

webrtc/rtc_base/bitbuffer.h

@@ -14,7 +14,7 @@
 #include <stdint.h>  // For integer types.
 #include <stddef.h>  // For size_t.
 
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace rtc {
 

webrtc/rtc_base/bitbuffer_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/bitbuffer.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/bitbuffer.h"
+#include "webrtc/base/bytebuffer.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/buffer.h

@@ -17,9 +17,9 @@
 #include <type_traits>
 #include <utility>
 
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/type_traits.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/type_traits.h"
 
 namespace rtc {
 

webrtc/rtc_base/buffer_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/base/buffer.h"
 
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/gunit.h"
 
 #include <type_traits>
 #include <utility>

webrtc/rtc_base/bufferqueue.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/bufferqueue.h"
+#include "webrtc/base/bufferqueue.h"
 
 #include <algorithm>
 

webrtc/rtc_base/bufferqueue.h

@@ -14,9 +14,9 @@
 #include <deque>
 #include <vector>
 
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 
 namespace rtc {
 

webrtc/rtc_base/bufferqueue_unittest.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/bufferqueue.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/bufferqueue.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/bytebuffer.cc

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/base/bytebuffer.h"
 
 #include <string.h>
 
 #include <algorithm>
 
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/byteorder.h"
 
 namespace rtc {
 

webrtc/rtc_base/bytebuffer.h

@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace rtc {
 

webrtc/rtc_base/bytebuffer_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/bytebuffer.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/byteorder.h

@@ -15,7 +15,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/base/basictypes.h"
 
 #if defined(WEBRTC_MAC)
 #include <libkern/OSByteOrder.h>

webrtc/rtc_base/byteorder_unittest.cc

@@ -10,8 +10,8 @@
 
 #include <stdint.h>
 
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/callback.h

@@ -62,8 +62,8 @@
 #ifndef WEBRTC_RTC_BASE_CALLBACK_H_
 #define WEBRTC_RTC_BASE_CALLBACK_H_
 
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace rtc {
 

webrtc/rtc_base/callback_unittest.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/callback.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/keep_ref_until_done.h"
-#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/callback.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/keep_ref_until_done.h"
+#include "webrtc/base/refcount.h"
 
 namespace rtc {
 

webrtc/rtc_base/checks.cc

@@ -30,8 +30,8 @@
 #include <windows.h>
 #endif
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 #if defined(_MSC_VER)
 // Warning C4722: destructor never returns, potential memory leak.

webrtc/rtc_base/checks.h

@@ -36,7 +36,7 @@ NO_RETURN void rtc_FatalMessage(const char* file, int line, const char* msg);
 #include <sstream>
 #include <string>
 
-#include "webrtc/rtc_base/safe_compare.h"
+#include "webrtc/base/safe_compare.h"
 
 // The macros here print a message to stderr and abort under various
 // conditions. All will accept additional stream messages. For example:

webrtc/rtc_base/copyonwritebuffer.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/base/copyonwritebuffer.h"
 
 namespace rtc {
 

webrtc/rtc_base/copyonwritebuffer.h

@@ -14,10 +14,10 @@
 #include <algorithm>
 #include <utility>
 
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace rtc {
 

webrtc/rtc_base/copyonwritebuffer_unittest.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/copyonwritebuffer.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/cpu_time.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/cpu_time.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/cpu_time.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/timeutils.h"
 
 #if defined(WEBRTC_LINUX)
 #include <time.h>

webrtc/rtc_base/cpu_time_unittest.cc

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/cpu_time.h"
-#include <algorithm>
 #include <memory>
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include <algorithm>
+#include "webrtc/base/cpu_time.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/test/gtest.h"
 #include "webrtc/system_wrappers/include/cpu_info.h"
 #include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/gtest.h"
 
 // Only run these tests on non-instrumented builds, because timing on
 // instrumented builds is unreliable, causing the test to be flaky.

webrtc/rtc_base/crc32.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/base/crc32.h"
 
-#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/base/arraysize.h"
 
 namespace rtc {
 

webrtc/rtc_base/crc32.h

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

webrtc/rtc_base/crc32_unittest.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/crc32.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/crc32.h"
+#include "webrtc/base/gunit.h"
 
 #include <string>
 

webrtc/rtc_base/criticalsection.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/base/criticalsection.h"
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/platform_thread.h"
 
 // TODO(tommi): Split this file up to per-platform implementation files.
 

webrtc/rtc_base/criticalsection.h

@@ -11,11 +11,11 @@
 #ifndef WEBRTC_RTC_BASE_CRITICALSECTION_H_
 #define WEBRTC_RTC_BASE_CRITICALSECTION_H_
 
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/platform_thread_types.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/base/atomicops.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/platform_thread_types.h"
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/typedefs.h"
 
 #if defined(WEBRTC_WIN)

webrtc/rtc_base/criticalsection_unittest.cc

@@ -12,13 +12,13 @@
 #include <set>
 #include <vector>
 
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/thread.h"
 
 namespace rtc {
 

webrtc/rtc_base/cryptstring.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/cryptstring.h"
+#include "webrtc/base/cryptstring.h"
 
 namespace rtc {
 

webrtc/rtc_base/event.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/event.h"
+#include "webrtc/base/event.h"
 
 #if defined(WEBRTC_WIN)
 #include <windows.h>
@@ -20,7 +20,7 @@
 #error "Must define either WEBRTC_WIN or WEBRTC_POSIX."
 #endif
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace rtc {
 

webrtc/rtc_base/event.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_RTC_BASE_EVENT_H_
 #define WEBRTC_RTC_BASE_EVENT_H_
 
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 #if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"  // NOLINT: consider this a system header.
+#include "webrtc/base/win32.h"  // NOLINT: consider this a system header.
 #elif defined(WEBRTC_POSIX)
 #include <pthread.h>
 #else

webrtc/rtc_base/event_tracer.cc

@@ -7,21 +7,21 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/rtc_base/event_tracer.h"
+#include "webrtc/base/event_tracer.h"
 
 #include <inttypes.h>
 
 #include <string>
 #include <vector>
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/trace_event.h"
 
 // This is a guesstimate that should be enough in most cases.
 static const size_t kEventLoggerArgsStrBufferInitialSize = 256;
@@ -51,7 +51,7 @@ const unsigned char* EventTracer::GetCategoryEnabled(const char* name) {
 }
 
 // Arguments to this function (phase, etc.) are as defined in
-// webrtc/rtc_base/trace_event.h.
+// webrtc/base/trace_event.h.
 void EventTracer::AddTraceEvent(char phase,
                                 const unsigned char* category_enabled,
                                 const char* name,
@@ -232,7 +232,7 @@ class EventLogger final {
   struct TraceArg {
     const char* name;
     unsigned char type;
-    // Copied from webrtc/rtc_base/trace_event.h TraceValueUnion.
+    // Copied from webrtc/base/trace_event.h TraceValueUnion.
     union TraceArgValue {
       bool as_bool;
       unsigned long long as_uint;

webrtc/rtc_base/event_tracer_unittest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/event_tracer.h"
+#include "webrtc/base/event_tracer.h"
 
-#include "webrtc/rtc_base/trace_event.h"
+#include "webrtc/base/trace_event.h"
 #include "webrtc/system_wrappers/include/static_instance.h"
 #include "webrtc/test/gtest.h"
 

webrtc/rtc_base/event_unittest.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/fakeclock.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/base/fakeclock.h"
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/messagequeue.h"
 
 namespace rtc {
 

webrtc/rtc_base/fakeclock.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_RTC_BASE_FAKECLOCK_H_
 #define WEBRTC_RTC_BASE_FAKECLOCK_H_
 
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/timedelta.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/timedelta.h"
+#include "webrtc/base/timeutils.h"
 
 namespace rtc {
 

webrtc/rtc_base/fakenetwork.h

@@ -16,11 +16,11 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/network.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/network.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/thread.h"
 
 namespace rtc {
 

webrtc/rtc_base/fakesslidentity.h

@@ -15,9 +15,9 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/messagedigest.h"
+#include "webrtc/base/sslidentity.h"
 
 namespace rtc {
 

webrtc/rtc_base/file.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/file.h"
+#include "webrtc/base/file.h"
 
 #include <utility>
 

webrtc/rtc_base/file.h

@@ -15,9 +15,9 @@
 
 #include <string>
 
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/platform_file.h"
 
 namespace rtc {
 

webrtc/rtc_base/file_posix.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/file.h"
+#include "webrtc/base/file.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -18,7 +18,7 @@
 
 #include <limits>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace rtc {
 

webrtc/rtc_base/file_unittest.cc

@@ -12,13 +12,13 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/rtc_base/file.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/file.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 #if defined(WEBRTC_WIN)
 
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
 
 #else  // if defined(WEBRTC_WIN)
 

webrtc/rtc_base/file_win.cc

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/file.h"
+#include "webrtc/base/file.h"
 
 #include <io.h>
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
 
 #include <limits>  // NOLINT: win32.h should be considered a system header
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace rtc {
 

webrtc/rtc_base/filerotatingstream.cc

@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/filerotatingstream.h"
+#include "webrtc/base/filerotatingstream.h"
 
 #include <algorithm>
 #include <iostream>
 #include <string>
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/pathutils.h"
 
 // Note: We use std::cerr for logging in the write paths of this stream to avoid
 // infinite loops when logging.

webrtc/rtc_base/filerotatingstream.h

@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/stream.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/stream.h"
 
 namespace rtc {
 

webrtc/rtc_base/filerotatingstream_unittest.cc

@@ -10,12 +10,12 @@
 
 #include <memory>
 
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/filerotatingstream.h"
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/filerotatingstream.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/pathutils.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace rtc {

webrtc/rtc_base/fileutils.cc

@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/base/fileutils.h"
 
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stringutils.h"
 
 #if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32filesystem.h"
+#include "webrtc/base/win32filesystem.h"
 #else
-#include "webrtc/rtc_base/unixfilesystem.h"
+#include "webrtc/base/unixfilesystem.h"
 #endif
 
 #if !defined(WEBRTC_WIN)

webrtc/rtc_base/fileutils.h

@@ -21,9 +21,9 @@
 #include <unistd.h>
 #endif
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/platform_file.h"
 
 namespace rtc {
 

webrtc/rtc_base/fileutils_unittest.cc

@@ -10,10 +10,10 @@
 
 #include <memory>
 
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/stream.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stream.h"
 
 namespace rtc {
 

webrtc/rtc_base/firewallsocketserver.cc

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/base/firewallsocketserver.h"
 
 #include <algorithm>
 
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 namespace rtc {
 

webrtc/rtc_base/firewallsocketserver.h

@@ -12,8 +12,8 @@
 #define WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_
 
 #include <vector>
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/base/socketserver.h"
+#include "webrtc/base/criticalsection.h"
 
 namespace rtc {
 

webrtc/rtc_base/flags.cc

@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/flags.h"
+#include "webrtc/base/flags.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 #if defined(WEBRTC_WIN)
+#include "webrtc/base/win32.h"
 #include <shellapi.h>
-#include "webrtc/rtc_base/win32.h"
 #endif
 
 namespace rtc {

webrtc/rtc_base/flags.h

@@ -23,8 +23,8 @@
 #ifndef WEBRTC_RTC_BASE_FLAGS_H_
 #define WEBRTC_RTC_BASE_FLAGS_H_
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace rtc {
 

webrtc/rtc_base/function_view.h

@@ -14,7 +14,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 // Just like std::function, FunctionView will wrap any callable and hide its
 // actual type, exposing only its signature. But unlike std::function,

webrtc/rtc_base/function_view_unittest.cc

@@ -11,8 +11,8 @@
 #include <memory>
 #include <utility>
 
-#include "webrtc/rtc_base/function_view.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/function_view.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {
 

webrtc/rtc_base/gunit.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_RTC_BASE_GUNIT_H_
 #define WEBRTC_RTC_BASE_GUNIT_H_
 
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/fakeclock.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/thread.h"
 #if defined(GTEST_RELATIVE_PATH)
 #include "webrtc/test/gtest.h"
 #else

webrtc/rtc_base/helpers.cc

@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/base/helpers.h"
 
 #include <limits>
 #include <memory>
 
 #include <openssl/rand.h>
 
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/base64.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/timeutils.h"
 
 // Protect against max macro inclusion.
 #undef max

webrtc/rtc_base/helpers.h

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

webrtc/rtc_base/helpers_unittest.cc

@@ -10,10 +10,10 @@
 
 #include <string>
 
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/ssladapter.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpbase.cc

@@ -11,17 +11,17 @@
 #include <memory>
 
 #if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
 #else  // !WEBRTC_WIN
 #define SEC_E_CERT_EXPIRED (-2146893016)
 #endif  // !WEBRTC_WIN
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/httpbase.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/socket.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/httpbase.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/socket.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/thread.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpbase.h

@@ -12,7 +12,7 @@
 #ifndef WEBRTC_RTC_BASE_HTTPBASE_H_
 #define WEBRTC_RTC_BASE_HTTPBASE_H_
 
-#include "webrtc/rtc_base/httpcommon.h"
+#include "webrtc/base/httpcommon.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpbase_unittest.cc

@@ -10,9 +10,9 @@
 
 #include <algorithm>
 
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/httpbase.h"
-#include "webrtc/rtc_base/testutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/httpbase.h"
+#include "webrtc/base/testutils.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpcommon-inl.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_RTC_BASE_HTTPCOMMON_INL_H_
 #define WEBRTC_RTC_BASE_HTTPCOMMON_INL_H_
 
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/httpcommon.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/httpcommon.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpcommon.cc

@@ -21,16 +21,16 @@
 
 #include <algorithm>
 
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/cryptstring.h"
-#include "webrtc/rtc_base/httpcommon-inl.h"
-#include "webrtc/rtc_base/httpcommon.h"
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/base64.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/cryptstring.h"
+#include "webrtc/base/httpcommon-inl.h"
+#include "webrtc/base/httpcommon.h"
+#include "webrtc/base/messagedigest.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpcommon.h

@@ -15,10 +15,10 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/stream.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpcommon_unittest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/httpcommon.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/httpcommon-inl.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/httpcommon-inl.h"
+#include "webrtc/base/httpcommon.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpserver.cc

@@ -10,14 +10,14 @@
 
 #include <algorithm>
 
-#include "webrtc/rtc_base/httpcommon-inl.h"
+#include "webrtc/base/httpcommon-inl.h"
 
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/httpserver.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/socketstream.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/httpserver.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/socketstream.h"
+#include "webrtc/base/thread.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpserver.h

@@ -14,7 +14,7 @@
 #include <map>
 #include <memory>
 
-#include "webrtc/rtc_base/httpbase.h"
+#include "webrtc/base/httpbase.h"
 
 namespace rtc {
 

webrtc/rtc_base/httpserver_unittest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/httpserver.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/testutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/httpserver.h"
+#include "webrtc/base/testutils.h"
 
 using namespace webrtc::testing;
 

webrtc/rtc_base/ifaddrs-android.cc

@@ -9,19 +9,19 @@
  */
 
 #if defined(WEBRTC_ANDROID)
-#include "webrtc/rtc_base/ifaddrs-android.h"
+#include "webrtc/base/ifaddrs-android.h"
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/utsname.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <unistd.h>
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <unistd.h>
 
 namespace {
 

webrtc/rtc_base/ifaddrs_converter.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/ifaddrs_converter.h"
+#include "webrtc/base/ifaddrs_converter.h"
 
 namespace rtc {
 

webrtc/rtc_base/ifaddrs_converter.h

@@ -12,12 +12,12 @@
 #define WEBRTC_RTC_BASE_IFADDRS_CONVERTER_H_
 
 #if defined(WEBRTC_ANDROID)
-#include "webrtc/rtc_base/ifaddrs-android.h"
+#include "webrtc/base/ifaddrs-android.h"
 #else
 #include <ifaddrs.h>
 #endif  // WEBRTC_ANDROID
 
-#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/base/ipaddress.h"
 
 namespace rtc {
 

webrtc/rtc_base/ipaddress.cc

@@ -25,13 +25,13 @@
 
 #include <stdio.h>
 
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/ipaddress.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/ipaddress.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/win32.h"
 
 namespace rtc {
 

webrtc/rtc_base/ipaddress.h

@@ -25,10 +25,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/byteorder.h"
 #if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
 #endif
 
 namespace rtc {

webrtc/rtc_base/ipaddress_unittest.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/ipaddress.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/ipaddress.h"
 
 namespace rtc {
 

webrtc/rtc_base/json.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/json.h"
+#include "webrtc/base/json.h"
 
 #include <errno.h>
 #include <limits.h>

webrtc/rtc_base/json_unittest.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/rtc_base/json.h"
+#include "webrtc/base/json.h"
 
 #include <vector>
 
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
 
 namespace rtc {