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}
diff --git a/webrtc/rtc_base/array_view.h b/webrtc/rtc_base/array_view.h
index afc6999..0f0e3f3 100644
--- a/webrtc/rtc_base/array_view.h
+++ b/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 {
diff --git a/webrtc/rtc_base/array_view_unittest.cc b/webrtc/rtc_base/array_view_unittest.cc
index 6c30bef..035f25c 100644
--- a/webrtc/rtc_base/array_view_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncinvoker-inl.h b/webrtc/rtc_base/asyncinvoker-inl.h
index 5b2cf4e..427d76df 100644
--- a/webrtc/rtc_base/asyncinvoker-inl.h
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncinvoker.cc b/webrtc/rtc_base/asyncinvoker.cc
index 94abfd5..bfd1317 100644
--- a/webrtc/rtc_base/asyncinvoker.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncinvoker.h b/webrtc/rtc_base/asyncinvoker.h
index 17d702a..03e5724 100644
--- a/webrtc/rtc_base/asyncinvoker.h
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncpacketsocket.cc b/webrtc/rtc_base/asyncpacketsocket.cc
index 5c9bcbb..fe36401 100644
--- a/webrtc/rtc_base/asyncpacketsocket.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncpacketsocket.h b/webrtc/rtc_base/asyncpacketsocket.h
index 596812d..5a6c97e 100644
--- a/webrtc/rtc_base/asyncpacketsocket.h
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncresolverinterface.cc b/webrtc/rtc_base/asyncresolverinterface.cc
index b6f2c48..7ee02f1 100644
--- a/webrtc/rtc_base/asyncresolverinterface.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncresolverinterface.h b/webrtc/rtc_base/asyncresolverinterface.h
index 7b8c533..1784019 100644
--- a/webrtc/rtc_base/asyncresolverinterface.h
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncsocket.cc b/webrtc/rtc_base/asyncsocket.cc
index 7cb76cc..c593c4f 100644
--- a/webrtc/rtc_base/asyncsocket.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncsocket.h b/webrtc/rtc_base/asyncsocket.h
index 7284506..3aa5d76 100644
--- a/webrtc/rtc_base/asyncsocket.h
+++ b/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 {
diff --git a/webrtc/rtc_base/asynctcpsocket.cc b/webrtc/rtc_base/asynctcpsocket.cc
index 1da70df..658541c 100644
--- a/webrtc/rtc_base/asynctcpsocket.cc
+++ b/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>
diff --git a/webrtc/rtc_base/asynctcpsocket.h b/webrtc/rtc_base/asynctcpsocket.h
index 1fee4fe..cf76456 100644
--- a/webrtc/rtc_base/asynctcpsocket.h
+++ b/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 {
diff --git a/webrtc/rtc_base/asynctcpsocket_unittest.cc b/webrtc/rtc_base/asynctcpsocket_unittest.cc
index f120db0..bd7dcfb 100644
--- a/webrtc/rtc_base/asynctcpsocket_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncudpsocket.cc b/webrtc/rtc_base/asyncudpsocket.cc
index c5068a6..0bccb73 100644
--- a/webrtc/rtc_base/asyncudpsocket.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncudpsocket.h b/webrtc/rtc_base/asyncudpsocket.h
index 15c1e76..bff70f1 100644
--- a/webrtc/rtc_base/asyncudpsocket.h
+++ b/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 {
diff --git a/webrtc/rtc_base/asyncudpsocket_unittest.cc b/webrtc/rtc_base/asyncudpsocket_unittest.cc
index c16c59d..9922005 100644
--- a/webrtc/rtc_base/asyncudpsocket_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/atomicops_unittest.cc b/webrtc/rtc_base/atomicops_unittest.cc
index d5a1105..2aa28ca 100644
--- a/webrtc/rtc_base/atomicops_unittest.cc
+++ b/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.
diff --git a/webrtc/rtc_base/base64.cc b/webrtc/rtc_base/base64.cc
index 5fe424d..43b6325 100644
--- a/webrtc/rtc_base/base64.cc
+++ b/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;
diff --git a/webrtc/rtc_base/base64_unittest.cc b/webrtc/rtc_base/base64_unittest.cc
index c418c6f..6bfba79 100644
--- a/webrtc/rtc_base/base64_unittest.cc
+++ b/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;
diff --git a/webrtc/rtc_base/basictypes_unittest.cc b/webrtc/rtc_base/basictypes_unittest.cc
index 550e61d..df5ed5e 100644
--- a/webrtc/rtc_base/basictypes_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/bind.h b/webrtc/rtc_base/bind.h
index 0918fbc..975a5e0 100644
--- a/webrtc/rtc_base/bind.h
+++ b/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
diff --git a/webrtc/rtc_base/bind_unittest.cc b/webrtc/rtc_base/bind_unittest.cc
index 64d6ee4..c97a555 100644
--- a/webrtc/rtc_base/bind_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/bitbuffer.cc b/webrtc/rtc_base/bitbuffer.cc
index fec64e6..4ea2b15 100644
--- a/webrtc/rtc_base/bitbuffer.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/bitbuffer.h b/webrtc/rtc_base/bitbuffer.h
index 03e8ff9..bd5e5f8 100644
--- a/webrtc/rtc_base/bitbuffer.h
+++ b/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 {
diff --git a/webrtc/rtc_base/bitbuffer_unittest.cc b/webrtc/rtc_base/bitbuffer_unittest.cc
index b9d6155..1614299 100644
--- a/webrtc/rtc_base/bitbuffer_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/buffer.h b/webrtc/rtc_base/buffer.h
index 25d55e0..171d1ea 100644
--- a/webrtc/rtc_base/buffer.h
+++ b/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 {
diff --git a/webrtc/rtc_base/buffer_unittest.cc b/webrtc/rtc_base/buffer_unittest.cc
index bd4306e..82baedb 100644
--- a/webrtc/rtc_base/buffer_unittest.cc
+++ b/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>
diff --git a/webrtc/rtc_base/bufferqueue.cc b/webrtc/rtc_base/bufferqueue.cc
index 9072043..6e5439d 100644
--- a/webrtc/rtc_base/bufferqueue.cc
+++ b/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>
diff --git a/webrtc/rtc_base/bufferqueue.h b/webrtc/rtc_base/bufferqueue.h
index 3abb8cf..7db2c8c 100644
--- a/webrtc/rtc_base/bufferqueue.h
+++ b/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 {
diff --git a/webrtc/rtc_base/bufferqueue_unittest.cc b/webrtc/rtc_base/bufferqueue_unittest.cc
index 23d1751..07084c4 100644
--- a/webrtc/rtc_base/bufferqueue_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/bytebuffer.cc b/webrtc/rtc_base/bytebuffer.cc
index 6bee27f..859c123 100644
--- a/webrtc/rtc_base/bytebuffer.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/bytebuffer.h b/webrtc/rtc_base/bytebuffer.h
index 36b18d2..b631ae1 100644
--- a/webrtc/rtc_base/bytebuffer.h
+++ b/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 {
diff --git a/webrtc/rtc_base/bytebuffer_unittest.cc b/webrtc/rtc_base/bytebuffer_unittest.cc
index afca353..597f5f5 100644
--- a/webrtc/rtc_base/bytebuffer_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/byteorder.h b/webrtc/rtc_base/byteorder.h
index 760ea06..d188f31 100644
--- a/webrtc/rtc_base/byteorder.h
+++ b/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>
diff --git a/webrtc/rtc_base/byteorder_unittest.cc b/webrtc/rtc_base/byteorder_unittest.cc
index aba8e9f..6d9b44f 100644
--- a/webrtc/rtc_base/byteorder_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/callback.h b/webrtc/rtc_base/callback.h
index 41077e8..4435a18 100644
--- a/webrtc/rtc_base/callback.h
+++ b/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 {
diff --git a/webrtc/rtc_base/callback_unittest.cc b/webrtc/rtc_base/callback_unittest.cc
index 0628686..aba1e0c 100644
--- a/webrtc/rtc_base/callback_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/checks.cc b/webrtc/rtc_base/checks.cc
index 533240f..32c2f58 100644
--- a/webrtc/rtc_base/checks.cc
+++ b/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.
diff --git a/webrtc/rtc_base/checks.h b/webrtc/rtc_base/checks.h
index f9507e2..d2fb115 100644
--- a/webrtc/rtc_base/checks.h
+++ b/webrtc/rtc_base/checks.h
@@ -36,7 +36,7 @@
#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:
diff --git a/webrtc/rtc_base/copyonwritebuffer.cc b/webrtc/rtc_base/copyonwritebuffer.cc
index 76db6f5..e1ba8de 100644
--- a/webrtc/rtc_base/copyonwritebuffer.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/copyonwritebuffer.h b/webrtc/rtc_base/copyonwritebuffer.h
index a247917..d0cdafb 100644
--- a/webrtc/rtc_base/copyonwritebuffer.h
+++ b/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 {
diff --git a/webrtc/rtc_base/copyonwritebuffer_unittest.cc b/webrtc/rtc_base/copyonwritebuffer_unittest.cc
index 2845248..fefd0c7 100644
--- a/webrtc/rtc_base/copyonwritebuffer_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/cpu_time.cc b/webrtc/rtc_base/cpu_time.cc
index 41ac4ca..5fce366 100644
--- a/webrtc/rtc_base/cpu_time.cc
+++ b/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>
diff --git a/webrtc/rtc_base/cpu_time_unittest.cc b/webrtc/rtc_base/cpu_time_unittest.cc
index a9af7ba..bfdd7ef 100644
--- a/webrtc/rtc_base/cpu_time_unittest.cc
+++ b/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.
diff --git a/webrtc/rtc_base/crc32.cc b/webrtc/rtc_base/crc32.cc
index 3db6b1b..97b8214 100644
--- a/webrtc/rtc_base/crc32.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/crc32.h b/webrtc/rtc_base/crc32.h
index d8b121d..a7228df 100644
--- a/webrtc/rtc_base/crc32.h
+++ b/webrtc/rtc_base/crc32.h
@@ -13,7 +13,7 @@
#include <string>
-#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/base/basictypes.h"
namespace rtc {
diff --git a/webrtc/rtc_base/crc32_unittest.cc b/webrtc/rtc_base/crc32_unittest.cc
index 49c5600..6da5c32 100644
--- a/webrtc/rtc_base/crc32_unittest.cc
+++ b/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>
diff --git a/webrtc/rtc_base/criticalsection.cc b/webrtc/rtc_base/criticalsection.cc
index 08acb13..5a7bc76 100644
--- a/webrtc/rtc_base/criticalsection.cc
+++ b/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.
diff --git a/webrtc/rtc_base/criticalsection.h b/webrtc/rtc_base/criticalsection.h
index 38172d7..20a23ce 100644
--- a/webrtc/rtc_base/criticalsection.h
+++ b/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)
diff --git a/webrtc/rtc_base/criticalsection_unittest.cc b/webrtc/rtc_base/criticalsection_unittest.cc
index 672a674..a16f4f2 100644
--- a/webrtc/rtc_base/criticalsection_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/cryptstring.cc b/webrtc/rtc_base/cryptstring.cc
index 1df5407..4b2a83f 100644
--- a/webrtc/rtc_base/cryptstring.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/event.cc b/webrtc/rtc_base/event.cc
index cddf677..27506b3 100644
--- a/webrtc/rtc_base/event.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/event.h b/webrtc/rtc_base/event.h
index b3c0e7c..ca43d4d 100644
--- a/webrtc/rtc_base/event.h
+++ b/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
diff --git a/webrtc/rtc_base/event_tracer.cc b/webrtc/rtc_base/event_tracer.cc
index 8a6a7d5..cb7554a 100644
--- a/webrtc/rtc_base/event_tracer.cc
+++ b/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 @@
}
// 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 @@
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;
diff --git a/webrtc/rtc_base/event_tracer_unittest.cc b/webrtc/rtc_base/event_tracer_unittest.cc
index 527b4eb..a16c0ef 100644
--- a/webrtc/rtc_base/event_tracer_unittest.cc
+++ b/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"
diff --git a/webrtc/rtc_base/event_unittest.cc b/webrtc/rtc_base/event_unittest.cc
index 02da66f..996ad2f 100644
--- a/webrtc/rtc_base/event_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/fakeclock.cc b/webrtc/rtc_base/fakeclock.cc
index e9c3e9b..d95408f 100644
--- a/webrtc/rtc_base/fakeclock.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/fakeclock.h b/webrtc/rtc_base/fakeclock.h
index c5bdab1..659ae10 100644
--- a/webrtc/rtc_base/fakeclock.h
+++ b/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 {
diff --git a/webrtc/rtc_base/fakenetwork.h b/webrtc/rtc_base/fakenetwork.h
index 479540d..ef3b5da 100644
--- a/webrtc/rtc_base/fakenetwork.h
+++ b/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 {
diff --git a/webrtc/rtc_base/fakesslidentity.h b/webrtc/rtc_base/fakesslidentity.h
index ae9eeb1..cc23b31 100644
--- a/webrtc/rtc_base/fakesslidentity.h
+++ b/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 {
diff --git a/webrtc/rtc_base/file.cc b/webrtc/rtc_base/file.cc
index c4c5e5a..983eb8b 100644
--- a/webrtc/rtc_base/file.cc
+++ b/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>
diff --git a/webrtc/rtc_base/file.h b/webrtc/rtc_base/file.h
index 50639c4..7c82006 100644
--- a/webrtc/rtc_base/file.h
+++ b/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 {
diff --git a/webrtc/rtc_base/file_posix.cc b/webrtc/rtc_base/file_posix.cc
index fab6dd3..c386a34 100644
--- a/webrtc/rtc_base/file_posix.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/file_unittest.cc b/webrtc/rtc_base/file_unittest.cc
index a052a6e..99a5d58 100644
--- a/webrtc/rtc_base/file_unittest.cc
+++ b/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)
diff --git a/webrtc/rtc_base/file_win.cc b/webrtc/rtc_base/file_win.cc
index 6cb259a..71e6eff 100644
--- a/webrtc/rtc_base/file_win.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/filerotatingstream.cc b/webrtc/rtc_base/filerotatingstream.cc
index 37cd607..d1434de 100644
--- a/webrtc/rtc_base/filerotatingstream.cc
+++ b/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.
diff --git a/webrtc/rtc_base/filerotatingstream.h b/webrtc/rtc_base/filerotatingstream.h
index db8d1ac..9a4820a 100644
--- a/webrtc/rtc_base/filerotatingstream.h
+++ b/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 {
diff --git a/webrtc/rtc_base/filerotatingstream_unittest.cc b/webrtc/rtc_base/filerotatingstream_unittest.cc
index b5fcefb..9ce00da 100644
--- a/webrtc/rtc_base/filerotatingstream_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/fileutils.cc b/webrtc/rtc_base/fileutils.cc
index 9a97cda..187da14 100644
--- a/webrtc/rtc_base/fileutils.cc
+++ b/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)
diff --git a/webrtc/rtc_base/fileutils.h b/webrtc/rtc_base/fileutils.h
index b633a38..17e8103 100644
--- a/webrtc/rtc_base/fileutils.h
+++ b/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 {
diff --git a/webrtc/rtc_base/fileutils_unittest.cc b/webrtc/rtc_base/fileutils_unittest.cc
index 80dadf7..c9650e2 100644
--- a/webrtc/rtc_base/fileutils_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/firewallsocketserver.cc b/webrtc/rtc_base/firewallsocketserver.cc
index b60a943..4a2a404 100644
--- a/webrtc/rtc_base/firewallsocketserver.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/firewallsocketserver.h b/webrtc/rtc_base/firewallsocketserver.h
index d78a241..5c3abdc 100644
--- a/webrtc/rtc_base/firewallsocketserver.h
+++ b/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 {
diff --git a/webrtc/rtc_base/flags.cc b/webrtc/rtc_base/flags.cc
index 19d2f82..9b7177c 100644
--- a/webrtc/rtc_base/flags.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/flags.h b/webrtc/rtc_base/flags.h
index b2d8b76..3d4527c 100644
--- a/webrtc/rtc_base/flags.h
+++ b/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 {
diff --git a/webrtc/rtc_base/function_view.h b/webrtc/rtc_base/function_view.h
index a187d55..56964a6 100644
--- a/webrtc/rtc_base/function_view.h
+++ b/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,
diff --git a/webrtc/rtc_base/function_view_unittest.cc b/webrtc/rtc_base/function_view_unittest.cc
index 00a8714..c769fe6 100644
--- a/webrtc/rtc_base/function_view_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/gunit.h b/webrtc/rtc_base/gunit.h
index 3260019..b9b5a69 100644
--- a/webrtc/rtc_base/gunit.h
+++ b/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
diff --git a/webrtc/rtc_base/helpers.cc b/webrtc/rtc_base/helpers.cc
index f7b1fa8..aa6a6ae 100644
--- a/webrtc/rtc_base/helpers.cc
+++ b/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
diff --git a/webrtc/rtc_base/helpers.h b/webrtc/rtc_base/helpers.h
index fac2653..0a4298a 100644
--- a/webrtc/rtc_base/helpers.h
+++ b/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 {
diff --git a/webrtc/rtc_base/helpers_unittest.cc b/webrtc/rtc_base/helpers_unittest.cc
index d5c0cea..394e2b0 100644
--- a/webrtc/rtc_base/helpers_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/httpbase.cc b/webrtc/rtc_base/httpbase.cc
index 64cb5d9..bc8ac64 100644
--- a/webrtc/rtc_base/httpbase.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/httpbase.h b/webrtc/rtc_base/httpbase.h
index 5086502..d5730ba 100644
--- a/webrtc/rtc_base/httpbase.h
+++ b/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 {
diff --git a/webrtc/rtc_base/httpbase_unittest.cc b/webrtc/rtc_base/httpbase_unittest.cc
index 37a6b26..11fa821 100644
--- a/webrtc/rtc_base/httpbase_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/httpcommon-inl.h b/webrtc/rtc_base/httpcommon-inl.h
index f0b0242..c324831 100644
--- a/webrtc/rtc_base/httpcommon-inl.h
+++ b/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 {
diff --git a/webrtc/rtc_base/httpcommon.cc b/webrtc/rtc_base/httpcommon.cc
index a45d922..031505b 100644
--- a/webrtc/rtc_base/httpcommon.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/httpcommon.h b/webrtc/rtc_base/httpcommon.h
index bb96f98..12d18d5 100644
--- a/webrtc/rtc_base/httpcommon.h
+++ b/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 {
diff --git a/webrtc/rtc_base/httpcommon_unittest.cc b/webrtc/rtc_base/httpcommon_unittest.cc
index 2a4fe65..10e3789 100644
--- a/webrtc/rtc_base/httpcommon_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/httpserver.cc b/webrtc/rtc_base/httpserver.cc
index 9d7aafd..b190691 100644
--- a/webrtc/rtc_base/httpserver.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/httpserver.h b/webrtc/rtc_base/httpserver.h
index 0db78dd..a4acc4b 100644
--- a/webrtc/rtc_base/httpserver.h
+++ b/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 {
diff --git a/webrtc/rtc_base/httpserver_unittest.cc b/webrtc/rtc_base/httpserver_unittest.cc
index 1e5e0ff..4db4ad7 100644
--- a/webrtc/rtc_base/httpserver_unittest.cc
+++ b/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;
diff --git a/webrtc/rtc_base/ifaddrs-android.cc b/webrtc/rtc_base/ifaddrs-android.cc
index d225457..f3c7838 100644
--- a/webrtc/rtc_base/ifaddrs-android.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/ifaddrs_converter.cc b/webrtc/rtc_base/ifaddrs_converter.cc
index b9660e0..7dd3555 100644
--- a/webrtc/rtc_base/ifaddrs_converter.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/ifaddrs_converter.h b/webrtc/rtc_base/ifaddrs_converter.h
index 8a1fe69..0cda8d4 100644
--- a/webrtc/rtc_base/ifaddrs_converter.h
+++ b/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 {
diff --git a/webrtc/rtc_base/ipaddress.cc b/webrtc/rtc_base/ipaddress.cc
index fa24bef..c06a1a7 100644
--- a/webrtc/rtc_base/ipaddress.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/ipaddress.h b/webrtc/rtc_base/ipaddress.h
index 7ccea2d..e8a9f29 100644
--- a/webrtc/rtc_base/ipaddress.h
+++ b/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 {
diff --git a/webrtc/rtc_base/ipaddress_unittest.cc b/webrtc/rtc_base/ipaddress_unittest.cc
index 3389fef..802b47b 100644
--- a/webrtc/rtc_base/ipaddress_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/json.cc b/webrtc/rtc_base/json.cc
index 9a9968a..c692534 100644
--- a/webrtc/rtc_base/json.cc
+++ b/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>
diff --git a/webrtc/rtc_base/json_unittest.cc b/webrtc/rtc_base/json_unittest.cc
index 5b65bc8..fe3cf3b 100644
--- a/webrtc/rtc_base/json_unittest.cc
+++ b/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 {
diff --git a/webrtc/rtc_base/keep_ref_until_done.h b/webrtc/rtc_base/keep_ref_until_done.h
index 79f361c..e590e4c 100644
--- a/webrtc/rtc_base/keep_ref_until_done.h
+++ b/webrtc/rtc_base/keep_ref_until_done.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_RTC_BASE_KEEP_REF_UNTIL_DONE_H_
#define WEBRTC_RTC_BASE_KEEP_REF_UNTIL_DONE_H_
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/callback.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/callback.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
namespace rtc {
diff --git a/webrtc/rtc_base/location.cc b/webrtc/rtc_base/location.cc
index 9b0a5f6..c3dfe77 100644
--- a/webrtc/rtc_base/location.cc
+++ b/webrtc/rtc_base/location.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/location.h"
+#include "webrtc/base/location.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/location.h b/webrtc/rtc_base/location.h
index dd1b1ca..6a4c979 100644
--- a/webrtc/rtc_base/location.h
+++ b/webrtc/rtc_base/location.h
@@ -13,7 +13,7 @@
#include <string>
-#include "webrtc/rtc_base/stringize_macros.h"
+#include "webrtc/base/stringize_macros.h"
namespace rtc {
diff --git a/webrtc/rtc_base/logging.cc b/webrtc/rtc_base/logging.cc
index 4f46b0a..25f85c9 100644
--- a/webrtc/rtc_base/logging.cc
+++ b/webrtc/rtc_base/logging.cc
@@ -39,12 +39,12 @@
#include <ostream>
#include <vector>
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/logging.h b/webrtc/rtc_base/logging.h
index 345e0d3..455aac0 100644
--- a/webrtc/rtc_base/logging.h
+++ b/webrtc/rtc_base/logging.h
@@ -57,9 +57,9 @@
#include <CoreServices/CoreServices.h>
#endif
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/thread_annotations.h"
namespace rtc {
diff --git a/webrtc/rtc_base/logging_unittest.cc b/webrtc/rtc_base/logging_unittest.cc
index 5e7f67c..3d9fc9e 100644
--- a/webrtc/rtc_base/logging_unittest.cc
+++ b/webrtc/rtc_base/logging_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/logging.h"
-#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/rtc_base/thread.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/logsinks.cc b/webrtc/rtc_base/logsinks.cc
index ba0b5a5..5a6db45 100644
--- a/webrtc/rtc_base/logsinks.cc
+++ b/webrtc/rtc_base/logsinks.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/logsinks.h"
+#include "webrtc/base/logsinks.h"
#include <iostream>
#include <string>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/logsinks.h b/webrtc/rtc_base/logsinks.h
index e54d6ef..bfc3703 100644
--- a/webrtc/rtc_base/logsinks.h
+++ b/webrtc/rtc_base/logsinks.h
@@ -14,9 +14,9 @@
#include <memory>
#include <string>
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/filerotatingstream.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/filerotatingstream.h"
+#include "webrtc/base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/macifaddrs_converter.cc b/webrtc/rtc_base/macifaddrs_converter.cc
index 44e1087..2ad070e 100644
--- a/webrtc/rtc_base/macifaddrs_converter.cc
+++ b/webrtc/rtc_base/macifaddrs_converter.cc
@@ -14,9 +14,9 @@
#include <sys/ioctl.h>
#include <unistd.h>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/ifaddrs_converter.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/ifaddrs_converter.h"
+#include "webrtc/base/logging.h"
#if !defined(WEBRTC_IOS)
#include <net/if_media.h>
diff --git a/webrtc/rtc_base/macutils.cc b/webrtc/rtc_base/macutils.cc
index 282f782..6e90722 100644
--- a/webrtc/rtc_base/macutils.cc
+++ b/webrtc/rtc_base/macutils.cc
@@ -14,10 +14,10 @@
#include <sys/utsname.h>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/macutils.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/macutils.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/macutils_unittest.cc b/webrtc/rtc_base/macutils_unittest.cc
index f5f4b8d..d3e33e4 100644
--- a/webrtc/rtc_base/macutils_unittest.cc
+++ b/webrtc/rtc_base/macutils_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/macutils.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/macutils.h"
TEST(MacUtilsTest, GetOsVersionName) {
rtc::MacOSVersionName ver = rtc::GetOSVersionName();
diff --git a/webrtc/rtc_base/mathutils.h b/webrtc/rtc_base/mathutils.h
index e57697c..3882c32 100644
--- a/webrtc/rtc_base/mathutils.h
+++ b/webrtc/rtc_base/mathutils.h
@@ -14,7 +14,7 @@
#include <math.h>
#include <type_traits>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
#ifndef M_PI
#define M_PI 3.14159265359f
diff --git a/webrtc/rtc_base/md5.cc b/webrtc/rtc_base/md5.cc
index be4cac9..fda6ddd 100644
--- a/webrtc/rtc_base/md5.cc
+++ b/webrtc/rtc_base/md5.cc
@@ -18,12 +18,12 @@
// Changes from original C code:
// Ported to C++, type casting, Google code style.
-#include "webrtc/rtc_base/md5.h"
+#include "webrtc/base/md5.h"
// TODO: Avoid memcmpy - hash directly from memory.
#include <string.h> // for memcpy().
-#include "webrtc/rtc_base/byteorder.h" // for RTC_ARCH_CPU_LITTLE_ENDIAN.
+#include "webrtc/base/byteorder.h" // for RTC_ARCH_CPU_LITTLE_ENDIAN.
namespace rtc {
diff --git a/webrtc/rtc_base/md5digest.cc b/webrtc/rtc_base/md5digest.cc
index 543de7d..74f6bed 100644
--- a/webrtc/rtc_base/md5digest.cc
+++ b/webrtc/rtc_base/md5digest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/md5digest.h"
+#include "webrtc/base/md5digest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/md5digest.h b/webrtc/rtc_base/md5digest.h
index 2e7426d..be5b7d0 100644
--- a/webrtc/rtc_base/md5digest.h
+++ b/webrtc/rtc_base/md5digest.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_RTC_BASE_MD5DIGEST_H_
#define WEBRTC_RTC_BASE_MD5DIGEST_H_
-#include "webrtc/rtc_base/md5.h"
-#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/base/md5.h"
+#include "webrtc/base/messagedigest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/md5digest_unittest.cc b/webrtc/rtc_base/md5digest_unittest.cc
index f2f5eca..67c62db 100644
--- a/webrtc/rtc_base/md5digest_unittest.cc
+++ b/webrtc/rtc_base/md5digest_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/md5digest.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/md5digest.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/memory_usage.cc b/webrtc/rtc_base/memory_usage.cc
index 34fb910..d37a702 100644
--- a/webrtc/rtc_base/memory_usage.cc
+++ b/webrtc/rtc_base/memory_usage.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/memory_usage.h"
+#include "webrtc/base/memory_usage.h"
#if defined(WEBRTC_LINUX)
#include <unistd.h>
@@ -22,7 +22,7 @@
#include <psapi.h>
#endif
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/memory_usage_unittest.cc b/webrtc/rtc_base/memory_usage_unittest.cc
index 5b6224f..99857ec 100644
--- a/webrtc/rtc_base/memory_usage_unittest.cc
+++ b/webrtc/rtc_base/memory_usage_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/memory_usage.h"
+#include "webrtc/base/memory_usage.h"
#include <cstdio>
#include "webrtc/test/gtest.h"
diff --git a/webrtc/rtc_base/messagedigest.cc b/webrtc/rtc_base/messagedigest.cc
index a72ae40..05c8c4f 100644
--- a/webrtc/rtc_base/messagedigest.cc
+++ b/webrtc/rtc_base/messagedigest.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/base/messagedigest.h"
#include <memory>
#include <string.h>
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/openssldigest.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/openssldigest.h"
+#include "webrtc/base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagedigest_unittest.cc b/webrtc/rtc_base/messagedigest_unittest.cc
index ebc091a..86cf688 100644
--- a/webrtc/rtc_base/messagedigest_unittest.cc
+++ b/webrtc/rtc_base/messagedigest_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/messagedigest.h"
+#include "webrtc/base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagehandler.cc b/webrtc/rtc_base/messagehandler.cc
index 741049a..be5bb7f 100644
--- a/webrtc/rtc_base/messagehandler.cc
+++ b/webrtc/rtc_base/messagehandler.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/messagequeue.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagehandler.h b/webrtc/rtc_base/messagehandler.h
index 04e4b10..8cb4457 100644
--- a/webrtc/rtc_base/messagehandler.h
+++ b/webrtc/rtc_base/messagehandler.h
@@ -14,7 +14,7 @@
#include <memory>
#include <utility>
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagequeue.cc b/webrtc/rtc_base/messagequeue.cc
index c22cea7..fce1906 100644
--- a/webrtc/rtc_base/messagequeue.cc
+++ b/webrtc/rtc_base/messagequeue.cc
@@ -9,13 +9,13 @@
*/
#include <algorithm>
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/messagequeue.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "webrtc/base/atomicops.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/trace_event.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/messagequeue.h b/webrtc/rtc_base/messagequeue.h
index d4057cd..c8e247d 100644
--- a/webrtc/rtc_base/messagequeue.h
+++ b/webrtc/rtc_base/messagequeue.h
@@ -20,16 +20,16 @@
#include <utility>
#include <vector>
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/location.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/socketserver.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/location.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/socketserver.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/thread_annotations.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagequeue_unittest.cc b/webrtc/rtc_base/messagequeue_unittest.cc
index 78bcfcb..9652bb3 100644
--- a/webrtc/rtc_base/messagequeue_unittest.cc
+++ b/webrtc/rtc_base/messagequeue_unittest.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/base/messagequeue.h"
#include <functional>
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/nullsocketserver.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/atomicops.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/nullsocketserver.h"
using namespace rtc;
diff --git a/webrtc/rtc_base/mod_ops.h b/webrtc/rtc_base/mod_ops.h
index 211f2e3..d51f127 100644
--- a/webrtc/rtc_base/mod_ops.h
+++ b/webrtc/rtc_base/mod_ops.h
@@ -14,7 +14,7 @@
#include <limits>
#include <type_traits>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/mod_ops_unittest.cc b/webrtc/rtc_base/mod_ops_unittest.cc
index c375305..58c6a8e 100644
--- a/webrtc/rtc_base/mod_ops_unittest.cc
+++ b/webrtc/rtc_base/mod_ops_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/mod_ops.h"
+#include "webrtc/base/mod_ops.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/nat_unittest.cc b/webrtc/rtc_base/nat_unittest.cc
index 7454028..b7ec161 100644
--- a/webrtc/rtc_base/nat_unittest.cc
+++ b/webrtc/rtc_base/nat_unittest.cc
@@ -12,17 +12,17 @@
#include <memory>
#include <string>
-#include "webrtc/rtc_base/asynctcpsocket.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/natserver.h"
-#include "webrtc/rtc_base/natsocketfactory.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/network.h"
-#include "webrtc/rtc_base/physicalsocketserver.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/testclient.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/asynctcpsocket.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/natserver.h"
+#include "webrtc/base/natsocketfactory.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/network.h"
+#include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/ptr_util.h"
+#include "webrtc/base/testclient.h"
+#include "webrtc/base/virtualsocketserver.h"
using namespace rtc;
diff --git a/webrtc/rtc_base/natserver.cc b/webrtc/rtc_base/natserver.cc
index d3d1e14..e00bf9f 100644
--- a/webrtc/rtc_base/natserver.cc
+++ b/webrtc/rtc_base/natserver.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/natserver.h"
-#include "webrtc/rtc_base/natsocketfactory.h"
-#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/natsocketfactory.h"
+#include "webrtc/base/natserver.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/socketadapters.h"
namespace rtc {
diff --git a/webrtc/rtc_base/natserver.h b/webrtc/rtc_base/natserver.h
index fe901f9..136cc04 100644
--- a/webrtc/rtc_base/natserver.h
+++ b/webrtc/rtc_base/natserver.h
@@ -14,13 +14,13 @@
#include <map>
#include <set>
-#include "webrtc/rtc_base/asyncudpsocket.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/nattypes.h"
-#include "webrtc/rtc_base/proxyserver.h"
-#include "webrtc/rtc_base/socketaddresspair.h"
-#include "webrtc/rtc_base/socketfactory.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/socketaddresspair.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/socketfactory.h"
+#include "webrtc/base/nattypes.h"
+#include "webrtc/base/proxyserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/natsocketfactory.cc b/webrtc/rtc_base/natsocketfactory.cc
index ad746d7..95e6487 100644
--- a/webrtc/rtc_base/natsocketfactory.cc
+++ b/webrtc/rtc_base/natsocketfactory.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/natserver.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/natserver.h"
+#include "webrtc/base/virtualsocketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/natsocketfactory.h b/webrtc/rtc_base/natsocketfactory.h
index 9e7cce0..c2f72a8 100644
--- a/webrtc/rtc_base/natsocketfactory.h
+++ b/webrtc/rtc_base/natsocketfactory.h
@@ -16,10 +16,10 @@
#include <memory>
#include <set>
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/natserver.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/natserver.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/socketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nattypes.cc b/webrtc/rtc_base/nattypes.cc
index 973569b..1e37698 100644
--- a/webrtc/rtc_base/nattypes.cc
+++ b/webrtc/rtc_base/nattypes.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/nattypes.h"
+#include "webrtc/base/nattypes.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nethelpers.cc b/webrtc/rtc_base/nethelpers.cc
index 0f56416..6a411a6 100644
--- a/webrtc/rtc_base/nethelpers.cc
+++ b/webrtc/rtc_base/nethelpers.cc
@@ -8,30 +8,30 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/base/nethelpers.h"
#include <memory>
#if defined(WEBRTC_WIN)
#include <ws2spi.h>
#include <ws2tcpip.h>
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#endif
#if defined(WEBRTC_POSIX) && !defined(__native_client__)
#if defined(WEBRTC_ANDROID)
-#include "webrtc/rtc_base/ifaddrs-android.h"
+#include "webrtc/base/ifaddrs-android.h"
#else
#include <ifaddrs.h>
#endif
#endif // defined(WEBRTC_POSIX) && !defined(__native_client__)
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/ptr_util.h"
+#include "webrtc/base/task_queue.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nethelpers.h b/webrtc/rtc_base/nethelpers.h
index b5f0c01..99d0602 100644
--- a/webrtc/rtc_base/nethelpers.h
+++ b/webrtc/rtc_base/nethelpers.h
@@ -21,12 +21,12 @@
#include <list>
#include <memory>
-#include "webrtc/rtc_base/asyncresolverinterface.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/base/asyncresolverinterface.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/thread_checker.h"
namespace rtc {
diff --git a/webrtc/rtc_base/network.cc b/webrtc/rtc_base/network.cc
index add4c5d..69dc28c 100644
--- a/webrtc/rtc_base/network.cc
+++ b/webrtc/rtc_base/network.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/network.h"
+#include "webrtc/base/network.h"
#if defined(WEBRTC_POSIX)
// linux/if.h can't be included at the same time as the posix sys/if.h, and
@@ -23,10 +23,10 @@
#endif // WEBRTC_POSIX
#if defined(WEBRTC_WIN)
+#include "webrtc/base/win32.h"
#include <Iphlpapi.h>
-#include "webrtc/rtc_base/win32.h"
#elif !defined(__native_client__)
-#include "webrtc/rtc_base/ifaddrs_converter.h"
+#include "webrtc/base/ifaddrs_converter.h"
#endif
#include <stdio.h>
@@ -34,13 +34,13 @@
#include <algorithm>
#include <memory>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/networkmonitor.h"
-#include "webrtc/rtc_base/socket.h" // includes something that makes windows happy
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/networkmonitor.h"
+#include "webrtc/base/socket.h" // includes something that makes windows happy
+#include "webrtc/base/stream.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/thread.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/network.h b/webrtc/rtc_base/network.h
index 6f820bb..17574f6 100644
--- a/webrtc/rtc_base/network.h
+++ b/webrtc/rtc_base/network.h
@@ -19,10 +19,10 @@
#include <string>
#include <vector>
-#include "webrtc/rtc_base/ipaddress.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/networkmonitor.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/base/ipaddress.h"
+#include "webrtc/base/networkmonitor.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/sigslot.h"
#if defined(WEBRTC_POSIX)
struct ifaddrs;
diff --git a/webrtc/rtc_base/network_unittest.cc b/webrtc/rtc_base/network_unittest.cc
index 4240e06..27dab48 100644
--- a/webrtc/rtc_base/network_unittest.cc
+++ b/webrtc/rtc_base/network_unittest.cc
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/network.h"
+#include "webrtc/base/network.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/networkmonitor.h"
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/networkmonitor.h"
#if defined(WEBRTC_POSIX)
-#include <net/if.h>
#include <sys/types.h>
-#include "webrtc/rtc_base/ifaddrs_converter.h"
+#include <net/if.h>
+#include "webrtc/base/ifaddrs_converter.h"
#endif // defined(WEBRTC_POSIX)
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/logging.h" // For LOG_GLE
+#include "webrtc/base/logging.h" // For LOG_GLE
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/networkmonitor.cc b/webrtc/rtc_base/networkmonitor.cc
index a23cc77..e11e812 100644
--- a/webrtc/rtc_base/networkmonitor.cc
+++ b/webrtc/rtc_base/networkmonitor.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/networkmonitor.h"
+#include "webrtc/base/networkmonitor.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace {
const uint32_t UPDATE_NETWORKS_MESSAGE = 1;
diff --git a/webrtc/rtc_base/networkmonitor.h b/webrtc/rtc_base/networkmonitor.h
index f7cef1b..db976bf 100644
--- a/webrtc/rtc_base/networkmonitor.h
+++ b/webrtc/rtc_base/networkmonitor.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_RTC_BASE_NETWORKMONITOR_H_
#define WEBRTC_RTC_BASE_NETWORKMONITOR_H_
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nullsocketserver.cc b/webrtc/rtc_base/nullsocketserver.cc
index 5c65386..5dfd490 100644
--- a/webrtc/rtc_base/nullsocketserver.cc
+++ b/webrtc/rtc_base/nullsocketserver.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/nullsocketserver.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/nullsocketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nullsocketserver.h b/webrtc/rtc_base/nullsocketserver.h
index 997a416..f506e4c 100644
--- a/webrtc/rtc_base/nullsocketserver.h
+++ b/webrtc/rtc_base/nullsocketserver.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_RTC_BASE_NULLSOCKETSERVER_H_
#define WEBRTC_RTC_BASE_NULLSOCKETSERVER_H_
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/socketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nullsocketserver_unittest.cc b/webrtc/rtc_base/nullsocketserver_unittest.cc
index 5908d32..fb059c5 100644
--- a/webrtc/rtc_base/nullsocketserver_unittest.cc
+++ b/webrtc/rtc_base/nullsocketserver_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/nullsocketserver.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/nullsocketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/numerics/exp_filter.cc b/webrtc/rtc_base/numerics/exp_filter.cc
index b3d9610..a4754a6 100644
--- a/webrtc/rtc_base/numerics/exp_filter.cc
+++ b/webrtc/rtc_base/numerics/exp_filter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/base/numerics/exp_filter.h"
#include <math.h>
diff --git a/webrtc/rtc_base/numerics/exp_filter_unittest.cc b/webrtc/rtc_base/numerics/exp_filter_unittest.cc
index 892db1e..fbe88e0 100644
--- a/webrtc/rtc_base/numerics/exp_filter_unittest.cc
+++ b/webrtc/rtc_base/numerics/exp_filter_unittest.cc
@@ -10,7 +10,7 @@
#include <math.h>
-#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/base/numerics/exp_filter.h"
#include "webrtc/test/gtest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/numerics/percentile_filter.h b/webrtc/rtc_base/numerics/percentile_filter.h
index b514aab..66391f0 100644
--- a/webrtc/rtc_base/numerics/percentile_filter.h
+++ b/webrtc/rtc_base/numerics/percentile_filter.h
@@ -16,7 +16,7 @@
#include <iterator>
#include <set>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/numerics/percentile_filter_unittest.cc b/webrtc/rtc_base/numerics/percentile_filter_unittest.cc
index 22d2085..23e63ec 100644
--- a/webrtc/rtc_base/numerics/percentile_filter_unittest.cc
+++ b/webrtc/rtc_base/numerics/percentile_filter_unittest.cc
@@ -11,8 +11,8 @@
#include <algorithm>
#include <climits>
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/numerics/percentile_filter.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/numerics/percentile_filter.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/onetimeevent.h b/webrtc/rtc_base/onetimeevent.h
index 37afba2..f22a6dc 100644
--- a/webrtc/rtc_base/onetimeevent.h
+++ b/webrtc/rtc_base/onetimeevent.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_RTC_BASE_ONETIMEEVENT_H_
#define WEBRTC_RTC_BASE_ONETIMEEVENT_H_
-#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/base/criticalsection.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/onetimeevent_unittest.cc b/webrtc/rtc_base/onetimeevent_unittest.cc
index e4984e2..4ebc139 100644
--- a/webrtc/rtc_base/onetimeevent_unittest.cc
+++ b/webrtc/rtc_base/onetimeevent_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/onetimeevent.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/onetimeevent.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/openssladapter.cc b/webrtc/rtc_base/openssladapter.cc
index d0ed07a..9cc5ca9 100644
--- a/webrtc/rtc_base/openssladapter.cc
+++ b/webrtc/rtc_base/openssladapter.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/openssladapter.h"
+#include "webrtc/base/openssladapter.h"
#if defined(WEBRTC_POSIX)
#include <unistd.h>
#endif
// Must be included first before openssl headers.
-#include "webrtc/rtc_base/win32.h" // NOLINT
+#include "webrtc/base/win32.h" // NOLINT
#include <openssl/bio.h>
#include <openssl/crypto.h>
@@ -25,14 +25,14 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/openssl.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/sslroots.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/openssl.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/sslroots.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/thread.h"
#ifndef OPENSSL_IS_BORINGSSL
diff --git a/webrtc/rtc_base/openssladapter.h b/webrtc/rtc_base/openssladapter.h
index 2517145..7080b8b 100644
--- a/webrtc/rtc_base/openssladapter.h
+++ b/webrtc/rtc_base/openssladapter.h
@@ -12,10 +12,10 @@
#define WEBRTC_RTC_BASE_OPENSSLADAPTER_H_
#include <string>
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/messagequeue.h"
-#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/ssladapter.h"
typedef struct ssl_st SSL;
typedef struct ssl_ctx_st SSL_CTX;
diff --git a/webrtc/rtc_base/openssldigest.cc b/webrtc/rtc_base/openssldigest.cc
index fa27a46..3115074 100644
--- a/webrtc/rtc_base/openssldigest.cc
+++ b/webrtc/rtc_base/openssldigest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/openssldigest.h"
+#include "webrtc/base/openssldigest.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/openssl.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/openssl.h"
namespace rtc {
diff --git a/webrtc/rtc_base/openssldigest.h b/webrtc/rtc_base/openssldigest.h
index ab4ca16..05aded4 100644
--- a/webrtc/rtc_base/openssldigest.h
+++ b/webrtc/rtc_base/openssldigest.h
@@ -13,7 +13,7 @@
#include <openssl/evp.h>
-#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/base/messagedigest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/opensslidentity.cc b/webrtc/rtc_base/opensslidentity.cc
index a6b6e1c..9495496 100644
--- a/webrtc/rtc_base/opensslidentity.cc
+++ b/webrtc/rtc_base/opensslidentity.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/opensslidentity.h"
+#include "webrtc/base/opensslidentity.h"
#include <memory>
// Must be included first before openssl headers.
-#include "webrtc/rtc_base/win32.h" // NOLINT
+#include "webrtc/base/win32.h" // NOLINT
#include <openssl/bio.h>
#include <openssl/err.h>
@@ -22,11 +22,11 @@
#include <openssl/rsa.h>
#include <openssl/crypto.h>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/openssl.h"
-#include "webrtc/rtc_base/openssldigest.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/openssl.h"
+#include "webrtc/base/openssldigest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/opensslidentity.h b/webrtc/rtc_base/opensslidentity.h
index ed7c072..3d6c810 100644
--- a/webrtc/rtc_base/opensslidentity.h
+++ b/webrtc/rtc_base/opensslidentity.h
@@ -17,9 +17,9 @@
#include <memory>
#include <string>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/sslidentity.h"
typedef struct ssl_ctx_st SSL_CTX;
diff --git a/webrtc/rtc_base/opensslstreamadapter.cc b/webrtc/rtc_base/opensslstreamadapter.cc
index 1c0b578..d1c16a1 100644
--- a/webrtc/rtc_base/opensslstreamadapter.cc
+++ b/webrtc/rtc_base/opensslstreamadapter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/opensslstreamadapter.h"
+#include "webrtc/base/opensslstreamadapter.h"
#include <openssl/bio.h>
#include <openssl/crypto.h>
@@ -24,17 +24,17 @@
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/openssl.h"
-#include "webrtc/rtc_base/openssladapter.h"
-#include "webrtc/rtc_base/openssldigest.h"
-#include "webrtc/rtc_base/opensslidentity.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/openssl.h"
+#include "webrtc/base/openssladapter.h"
+#include "webrtc/base/openssldigest.h"
+#include "webrtc/base/opensslidentity.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/thread.h"
namespace {
bool g_use_time_callback_for_testing = false;
diff --git a/webrtc/rtc_base/opensslstreamadapter.h b/webrtc/rtc_base/opensslstreamadapter.h
index 32518ce..67c8046 100644
--- a/webrtc/rtc_base/opensslstreamadapter.h
+++ b/webrtc/rtc_base/opensslstreamadapter.h
@@ -15,9 +15,9 @@
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/opensslidentity.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/sslstreamadapter.h"
+#include "webrtc/base/opensslidentity.h"
typedef struct ssl_st SSL;
typedef struct ssl_ctx_st SSL_CTX;
diff --git a/webrtc/rtc_base/optional.cc b/webrtc/rtc_base/optional.cc
index 4b41a2d..6bebdd5 100644
--- a/webrtc/rtc_base/optional.cc
+++ b/webrtc/rtc_base/optional.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/optional.h"
namespace rtc {
namespace optional_internal {
diff --git a/webrtc/rtc_base/optional.h b/webrtc/rtc_base/optional.h
index 6871f3d..ab3abf9 100644
--- a/webrtc/rtc_base/optional.h
+++ b/webrtc/rtc_base/optional.h
@@ -20,9 +20,9 @@
#include <ostream>
#endif // UNIT_TEST
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/sanitizer.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/sanitizer.h"
namespace rtc {
diff --git a/webrtc/rtc_base/optional_unittest.cc b/webrtc/rtc_base/optional_unittest.cc
index 8f2f7fd..1303552 100644
--- a/webrtc/rtc_base/optional_unittest.cc
+++ b/webrtc/rtc_base/optional_unittest.cc
@@ -14,8 +14,8 @@
#include <utility>
#include <vector>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/optional.h"
namespace rtc {
diff --git a/webrtc/rtc_base/optionsfile.cc b/webrtc/rtc_base/optionsfile.cc
index e8401fb..ae37877 100644
--- a/webrtc/rtc_base/optionsfile.cc
+++ b/webrtc/rtc_base/optionsfile.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/optionsfile.h"
+#include "webrtc/base/optionsfile.h"
#include <ctype.h>
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/optionsfile_unittest.cc b/webrtc/rtc_base/optionsfile_unittest.cc
index 525c317..69bd719 100644
--- a/webrtc/rtc_base/optionsfile_unittest.cc
+++ b/webrtc/rtc_base/optionsfile_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/optionsfile.h"
-#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/optionsfile.h"
+#include "webrtc/base/pathutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/pathutils.cc b/webrtc/rtc_base/pathutils.cc
index 8329f2a..3036774 100644
--- a/webrtc/rtc_base/pathutils.cc
+++ b/webrtc/rtc_base/pathutils.cc
@@ -9,16 +9,16 @@
*/
#if defined(WEBRTC_WIN)
+#include "webrtc/base/win32.h"
#include <shellapi.h>
#include <shlobj.h>
#include <tchar.h>
-#include "webrtc/rtc_base/win32.h"
#endif // WEBRTC_WIN
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/pathutils.h b/webrtc/rtc_base/pathutils.h
index bce5add..20305ca 100644
--- a/webrtc/rtc_base/pathutils.h
+++ b/webrtc/rtc_base/pathutils.h
@@ -13,7 +13,7 @@
#include <string>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/pathutils_unittest.cc b/webrtc/rtc_base/pathutils_unittest.cc
index 390ae8a..b99bc16 100644
--- a/webrtc/rtc_base/pathutils_unittest.cc
+++ b/webrtc/rtc_base/pathutils_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/gunit.h"
TEST(Pathname, ReturnsDotForEmptyPathname) {
const std::string kCWD =
diff --git a/webrtc/rtc_base/physicalsocketserver.cc b/webrtc/rtc_base/physicalsocketserver.cc
index 8c6c7dd..655d397 100644
--- a/webrtc/rtc_base/physicalsocketserver.cc
+++ b/webrtc/rtc_base/physicalsocketserver.cc
@@ -7,7 +7,7 @@
* 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/physicalsocketserver.h"
+#include "webrtc/base/physicalsocketserver.h"
#if defined(_MSC_VER) && _MSC_VER < 1300
#pragma warning(disable:4786)
@@ -43,15 +43,15 @@
#include <algorithm>
#include <map>
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/networkmonitor.h"
-#include "webrtc/rtc_base/nullsocketserver.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/win32socketinit.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/networkmonitor.h"
+#include "webrtc/base/nullsocketserver.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/win32socketinit.h"
#if defined(WEBRTC_POSIX)
#include <netinet/tcp.h> // for TCP_NODELAY
diff --git a/webrtc/rtc_base/physicalsocketserver.h b/webrtc/rtc_base/physicalsocketserver.h
index 680b4dd..55433bd 100644
--- a/webrtc/rtc_base/physicalsocketserver.h
+++ b/webrtc/rtc_base/physicalsocketserver.h
@@ -20,9 +20,9 @@
#include <set>
#include <vector>
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/socketserver.h"
+#include "webrtc/base/criticalsection.h"
#if defined(WEBRTC_POSIX)
typedef int SOCKET;
diff --git a/webrtc/rtc_base/physicalsocketserver_unittest.cc b/webrtc/rtc_base/physicalsocketserver_unittest.cc
index ee95c23..20e66ce 100644
--- a/webrtc/rtc_base/physicalsocketserver_unittest.cc
+++ b/webrtc/rtc_base/physicalsocketserver_unittest.cc
@@ -12,13 +12,13 @@
#include <signal.h>
#include <stdarg.h>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/networkmonitor.h"
-#include "webrtc/rtc_base/physicalsocketserver.h"
-#include "webrtc/rtc_base/socket_unittest.h"
-#include "webrtc/rtc_base/testutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/networkmonitor.h"
+#include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/socket_unittest.h"
+#include "webrtc/base/testutils.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/platform_file.cc b/webrtc/rtc_base/platform_file.cc
index acbac6f..a00543c 100644
--- a/webrtc/rtc_base/platform_file.cc
+++ b/webrtc/rtc_base/platform_file.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/base/platform_file.h"
#if defined(WEBRTC_WIN)
#include <io.h>
diff --git a/webrtc/rtc_base/platform_file.h b/webrtc/rtc_base/platform_file.h
index 2a5f6ed..ccb7bfc 100644
--- a/webrtc/rtc_base/platform_file.h
+++ b/webrtc/rtc_base/platform_file.h
@@ -15,7 +15,7 @@
#include <string>
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/platform_thread.cc b/webrtc/rtc_base/platform_thread.cc
index f65743e..d3a1a03 100644
--- a/webrtc/rtc_base/platform_thread.cc
+++ b/webrtc/rtc_base/platform_thread.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/base/platform_thread.h"
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "webrtc/base/atomicops.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/trace_event.h"
#if defined(WEBRTC_LINUX)
#include <sys/prctl.h>
diff --git a/webrtc/rtc_base/platform_thread.h b/webrtc/rtc_base/platform_thread.h
index 4121c97..84f2b67 100644
--- a/webrtc/rtc_base/platform_thread.h
+++ b/webrtc/rtc_base/platform_thread.h
@@ -13,10 +13,10 @@
#include <string>
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/platform_thread_types.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/platform_thread_types.h"
+#include "webrtc/base/thread_checker.h"
namespace rtc {
diff --git a/webrtc/rtc_base/platform_thread_unittest.cc b/webrtc/rtc_base/platform_thread_unittest.cc
index ae1a1d0..415b9eb 100644
--- a/webrtc/rtc_base/platform_thread_unittest.cc
+++ b/webrtc/rtc_base/platform_thread_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/base/platform_thread.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/rtc_base/proxy_unittest.cc b/webrtc/rtc_base/proxy_unittest.cc
index f4b51ad..f7668b5 100644
--- a/webrtc/rtc_base/proxy_unittest.cc
+++ b/webrtc/rtc_base/proxy_unittest.cc
@@ -10,13 +10,13 @@
#include <memory>
#include <string>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/httpserver.h"
-#include "webrtc/rtc_base/proxyserver.h"
-#include "webrtc/rtc_base/socketadapters.h"
-#include "webrtc/rtc_base/testclient.h"
-#include "webrtc/rtc_base/testechoserver.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/httpserver.h"
+#include "webrtc/base/proxyserver.h"
+#include "webrtc/base/socketadapters.h"
+#include "webrtc/base/testclient.h"
+#include "webrtc/base/testechoserver.h"
+#include "webrtc/base/virtualsocketserver.h"
using rtc::Socket;
using rtc::Thread;
diff --git a/webrtc/rtc_base/proxyinfo.cc b/webrtc/rtc_base/proxyinfo.cc
index 8603f21..76c7708 100644
--- a/webrtc/rtc_base/proxyinfo.cc
+++ b/webrtc/rtc_base/proxyinfo.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/proxyinfo.h"
+#include "webrtc/base/proxyinfo.h"
namespace rtc {
diff --git a/webrtc/rtc_base/proxyinfo.h b/webrtc/rtc_base/proxyinfo.h
index 9b70642..89bb1b7 100644
--- a/webrtc/rtc_base/proxyinfo.h
+++ b/webrtc/rtc_base/proxyinfo.h
@@ -12,8 +12,8 @@
#define WEBRTC_RTC_BASE_PROXYINFO_H_
#include <string>
-#include "webrtc/rtc_base/cryptstring.h"
-#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/cryptstring.h"
namespace rtc {
diff --git a/webrtc/rtc_base/proxyserver.cc b/webrtc/rtc_base/proxyserver.cc
index 18dceac..713a986 100644
--- a/webrtc/rtc_base/proxyserver.cc
+++ b/webrtc/rtc_base/proxyserver.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/proxyserver.h"
+#include "webrtc/base/proxyserver.h"
#include <algorithm>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/socketfactory.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/socketfactory.h"
namespace rtc {
diff --git a/webrtc/rtc_base/proxyserver.h b/webrtc/rtc_base/proxyserver.h
index 218d5b3..2fba0fb 100644
--- a/webrtc/rtc_base/proxyserver.h
+++ b/webrtc/rtc_base/proxyserver.h
@@ -13,11 +13,11 @@
#include <list>
#include <memory>
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/socketadapters.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/stream.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/socketadapters.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/stream.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ptr_util_unittest.cc b/webrtc/rtc_base/ptr_util_unittest.cc
index 5948c39..22669c5 100644
--- a/webrtc/rtc_base/ptr_util_unittest.cc
+++ b/webrtc/rtc_base/ptr_util_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/base/ptr_util.h"
#include <stddef.h>
#include <string>
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/race_checker.cc b/webrtc/rtc_base/race_checker.cc
index 93d563b..92bdd7b 100644
--- a/webrtc/rtc_base/race_checker.cc
+++ b/webrtc/rtc_base/race_checker.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/race_checker.h"
+#include "webrtc/base/race_checker.h"
namespace rtc {
diff --git a/webrtc/rtc_base/race_checker.h b/webrtc/rtc_base/race_checker.h
index b49db53..a7c893c 100644
--- a/webrtc/rtc_base/race_checker.h
+++ b/webrtc/rtc_base/race_checker.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_RTC_BASE_RACE_CHECKER_H_
#define WEBRTC_RTC_BASE_RACE_CHECKER_H_
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/thread_annotations.h"
namespace rtc {
diff --git a/webrtc/rtc_base/random.cc b/webrtc/rtc_base/random.cc
index c0cf7fe..14a9faf 100644
--- a/webrtc/rtc_base/random.cc
+++ b/webrtc/rtc_base/random.cc
@@ -7,11 +7,11 @@
* 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/random.h"
+#include "webrtc/base/random.h"
#include <math.h>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/random.h b/webrtc/rtc_base/random.h
index 1ee6e74..d8d157c 100644
--- a/webrtc/rtc_base/random.h
+++ b/webrtc/rtc_base/random.h
@@ -13,9 +13,9 @@
#include <limits>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
#include "webrtc/typedefs.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/checks.h"
namespace webrtc {
@@ -30,7 +30,7 @@
// Besides the quality of the random seed being poor, this also requires
// the client to take on extra dependencies to generate a seed.
// If we go for a static seed generator in Random, we can use something from
- // webrtc/rtc_base and make sure that it works the same way across platforms.
+ // webrtc/base and make sure that it works the same way across platforms.
// See also discussion here: https://codereview.webrtc.org/1623543002/
explicit Random(uint64_t seed);
diff --git a/webrtc/rtc_base/random_unittest.cc b/webrtc/rtc_base/random_unittest.cc
index 0af2733..704e81f 100644
--- a/webrtc/rtc_base/random_unittest.cc
+++ b/webrtc/rtc_base/random_unittest.cc
@@ -13,8 +13,8 @@
#include <limits>
#include <vector>
-#include "webrtc/rtc_base/mathutils.h" // unsigned difference
-#include "webrtc/rtc_base/random.h"
+#include "webrtc/base/mathutils.h" // unsigned difference
+#include "webrtc/base/random.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/rate_limiter.cc b/webrtc/rtc_base/rate_limiter.cc
index b2ee2c0..9215fa0 100644
--- a/webrtc/rtc_base/rate_limiter.cc
+++ b/webrtc/rtc_base/rate_limiter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/rate_limiter.h"
+#include "webrtc/base/rate_limiter.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/rate_limiter.h b/webrtc/rtc_base/rate_limiter.h
index b4b9080..e13aad0 100644
--- a/webrtc/rtc_base/rate_limiter.h
+++ b/webrtc/rtc_base/rate_limiter.h
@@ -13,9 +13,9 @@
#include <limits>
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/rate_statistics.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/rate_statistics.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/rate_limiter_unittest.cc b/webrtc/rtc_base/rate_limiter_unittest.cc
index 6478399..6d92567 100644
--- a/webrtc/rtc_base/rate_limiter_unittest.cc
+++ b/webrtc/rtc_base/rate_limiter_unittest.cc
@@ -11,10 +11,10 @@
#include <algorithm>
#include <memory>
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/rate_limiter.h"
-#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/rate_limiter.h"
+#include "webrtc/base/task_queue.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/rtc_base/rate_statistics.cc b/webrtc/rtc_base/rate_statistics.cc
index a218540..3122dbb 100644
--- a/webrtc/rtc_base/rate_statistics.cc
+++ b/webrtc/rtc_base/rate_statistics.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/rate_statistics.h"
+#include "webrtc/base/rate_statistics.h"
#include <algorithm>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/rate_statistics.h b/webrtc/rtc_base/rate_statistics.h
index 7c4daea..0a3077b 100644
--- a/webrtc/rtc_base/rate_statistics.h
+++ b/webrtc/rtc_base/rate_statistics.h
@@ -13,7 +13,7 @@
#include <memory>
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/optional.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/rate_statistics_unittest.cc b/webrtc/rtc_base/rate_statistics_unittest.cc
index 23d1a3c..06136f5 100644
--- a/webrtc/rtc_base/rate_statistics_unittest.cc
+++ b/webrtc/rtc_base/rate_statistics_unittest.cc
@@ -10,7 +10,7 @@
#include <algorithm>
-#include "webrtc/rtc_base/rate_statistics.h"
+#include "webrtc/base/rate_statistics.h"
#include "webrtc/test/gtest.h"
namespace {
diff --git a/webrtc/rtc_base/ratelimiter.cc b/webrtc/rtc_base/ratelimiter.cc
index 7bf954f..c4a251d 100644
--- a/webrtc/rtc_base/ratelimiter.cc
+++ b/webrtc/rtc_base/ratelimiter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/ratelimiter.h"
+#include "webrtc/base/ratelimiter.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratelimiter_unittest.cc b/webrtc/rtc_base/ratelimiter_unittest.cc
index 3962ea3..b54a751 100644
--- a/webrtc/rtc_base/ratelimiter_unittest.cc
+++ b/webrtc/rtc_base/ratelimiter_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/ratelimiter.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/ratelimiter.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratetracker.cc b/webrtc/rtc_base/ratetracker.cc
index 731de8e..a59ec2f 100644
--- a/webrtc/rtc_base/ratetracker.cc
+++ b/webrtc/rtc_base/ratetracker.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/base/ratetracker.h"
#include <stddef.h>
#include <algorithm>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratetracker.h b/webrtc/rtc_base/ratetracker.h
index 3731600..7cdf4a5 100644
--- a/webrtc/rtc_base/ratetracker.h
+++ b/webrtc/rtc_base/ratetracker.h
@@ -12,7 +12,7 @@
#define WEBRTC_RTC_BASE_RATETRACKER_H_
#include <stdlib.h>
-#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/base/basictypes.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratetracker_unittest.cc b/webrtc/rtc_base/ratetracker_unittest.cc
index 27aa3a9..e2b51c1 100644
--- a/webrtc/rtc_base/ratetracker_unittest.cc
+++ b/webrtc/rtc_base/ratetracker_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/ratetracker.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/ratetracker.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/refcount.h b/webrtc/rtc_base/refcount.h
index c3744d0..d67e287 100644
--- a/webrtc/rtc_base/refcount.h
+++ b/webrtc/rtc_base/refcount.h
@@ -10,7 +10,7 @@
#ifndef WEBRTC_RTC_BASE_REFCOUNT_H_
#define WEBRTC_RTC_BASE_REFCOUNT_H_
-#include "webrtc/rtc_base/refcountedobject.h"
+#include "webrtc/base/refcountedobject.h"
namespace rtc {
diff --git a/webrtc/rtc_base/refcountedobject.h b/webrtc/rtc_base/refcountedobject.h
index bf66af2..5c9e7f1 100644
--- a/webrtc/rtc_base/refcountedobject.h
+++ b/webrtc/rtc_base/refcountedobject.h
@@ -12,7 +12,7 @@
#include <utility>
-#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/base/atomicops.h"
namespace rtc {
diff --git a/webrtc/rtc_base/refcountedobject_unittest.cc b/webrtc/rtc_base/refcountedobject_unittest.cc
index 8b27e71..f6096be 100644
--- a/webrtc/rtc_base/refcountedobject_unittest.cc
+++ b/webrtc/rtc_base/refcountedobject_unittest.cc
@@ -10,8 +10,8 @@
#include <string>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/refcount.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rollingaccumulator.h b/webrtc/rtc_base/rollingaccumulator.h
index 9008db6..40b2611 100644
--- a/webrtc/rtc_base/rollingaccumulator.h
+++ b/webrtc/rtc_base/rollingaccumulator.h
@@ -14,8 +14,8 @@
#include <algorithm>
#include <vector>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rollingaccumulator_unittest.cc b/webrtc/rtc_base/rollingaccumulator_unittest.cc
index ce4b4df..7e3d8cd 100644
--- a/webrtc/rtc_base/rollingaccumulator_unittest.cc
+++ b/webrtc/rtc_base/rollingaccumulator_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/rollingaccumulator.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/rollingaccumulator.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificate.cc b/webrtc/rtc_base/rtccertificate.cc
index f5af47e..3b3b8c9 100644
--- a/webrtc/rtc_base/rtccertificate.cc
+++ b/webrtc/rtc_base/rtccertificate.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/base/rtccertificate.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificate.h b/webrtc/rtc_base/rtccertificate.h
index 141023f..e97ca73 100644
--- a/webrtc/rtc_base/rtccertificate.h
+++ b/webrtc/rtc_base/rtccertificate.h
@@ -15,9 +15,9 @@
#include <memory>
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificate_unittest.cc b/webrtc/rtc_base/rtccertificate_unittest.cc
index 348364d..b318717 100644
--- a/webrtc/rtc_base/rtccertificate_unittest.cc
+++ b/webrtc/rtc_base/rtccertificate_unittest.cc
@@ -11,15 +11,15 @@
#include <memory>
#include <utility>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakesslidentity.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/rtccertificate.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/fakesslidentity.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/rtccertificate.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/sslidentity.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificategenerator.cc b/webrtc/rtc_base/rtccertificategenerator.cc
index 74e9336..461a00c 100644
--- a/webrtc/rtc_base/rtccertificategenerator.cc
+++ b/webrtc/rtc_base/rtccertificategenerator.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/base/rtccertificategenerator.h"
#include <algorithm>
#include <memory>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificategenerator.h b/webrtc/rtc_base/rtccertificategenerator.h
index 272a5d6..783ed78 100644
--- a/webrtc/rtc_base/rtccertificategenerator.h
+++ b/webrtc/rtc_base/rtccertificategenerator.h
@@ -11,12 +11,12 @@
#ifndef WEBRTC_RTC_BASE_RTCCERTIFICATEGENERATOR_H_
#define WEBRTC_RTC_BASE_RTCCERTIFICATEGENERATOR_H_
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/rtccertificate.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/rtccertificate.h"
+#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/base/sslidentity.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificategenerator_unittest.cc b/webrtc/rtc_base/rtccertificategenerator_unittest.cc
index f09f797..8dc3cd2 100644
--- a/webrtc/rtc_base/rtccertificategenerator_unittest.cc
+++ b/webrtc/rtc_base/rtccertificategenerator_unittest.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/base/rtccertificategenerator.h"
#include <memory>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/safe_compare.h b/webrtc/rtc_base/safe_compare.h
index e9c622b..4eb11c2 100644
--- a/webrtc/rtc_base/safe_compare.h
+++ b/webrtc/rtc_base/safe_compare.h
@@ -37,7 +37,7 @@
#include <type_traits>
#include <utility>
-#include "webrtc/rtc_base/type_traits.h"
+#include "webrtc/base/type_traits.h"
namespace rtc {
diff --git a/webrtc/rtc_base/safe_compare_unittest.cc b/webrtc/rtc_base/safe_compare_unittest.cc
index 2a135a1..1ebb722 100644
--- a/webrtc/rtc_base/safe_compare_unittest.cc
+++ b/webrtc/rtc_base/safe_compare_unittest.cc
@@ -10,7 +10,7 @@
#include <limits>
-#include "webrtc/rtc_base/safe_compare.h"
+#include "webrtc/base/safe_compare.h"
#include "webrtc/test/gtest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/safe_conversions.h b/webrtc/rtc_base/safe_conversions.h
index 877f28a..f8d73e7 100644
--- a/webrtc/rtc_base/safe_conversions.h
+++ b/webrtc/rtc_base/safe_conversions.h
@@ -15,8 +15,8 @@
#include <limits>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/safe_conversions_impl.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/safe_conversions_impl.h"
namespace rtc {
diff --git a/webrtc/rtc_base/safe_minmax.h b/webrtc/rtc_base/safe_minmax.h
index 77d75a1..bb60a36 100644
--- a/webrtc/rtc_base/safe_minmax.h
+++ b/webrtc/rtc_base/safe_minmax.h
@@ -79,9 +79,9 @@
#include <limits>
#include <type_traits>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/safe_compare.h"
-#include "webrtc/rtc_base/type_traits.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/safe_compare.h"
+#include "webrtc/base/type_traits.h"
namespace rtc {
diff --git a/webrtc/rtc_base/safe_minmax_unittest.cc b/webrtc/rtc_base/safe_minmax_unittest.cc
index a75b16d..eb0fe80 100644
--- a/webrtc/rtc_base/safe_minmax_unittest.cc
+++ b/webrtc/rtc_base/safe_minmax_unittest.cc
@@ -11,7 +11,7 @@
#include <algorithm>
#include <limits>
-#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/base/safe_minmax.h"
#include "webrtc/test/gtest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sequenced_task_checker.h b/webrtc/rtc_base/sequenced_task_checker.h
index 40b07f9..5e127c7 100644
--- a/webrtc/rtc_base/sequenced_task_checker.h
+++ b/webrtc/rtc_base/sequenced_task_checker.h
@@ -16,10 +16,10 @@
// with this define will get the same level of checking as debug bots.
#define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/sequenced_task_checker_impl.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/thread_annotations.h"
+#include "webrtc/base/sequenced_task_checker_impl.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sequenced_task_checker_impl.cc b/webrtc/rtc_base/sequenced_task_checker_impl.cc
index 0d2ae3e..f03e0b6 100644
--- a/webrtc/rtc_base/sequenced_task_checker_impl.cc
+++ b/webrtc/rtc_base/sequenced_task_checker_impl.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sequenced_task_checker_impl.h"
+#include "webrtc/base/sequenced_task_checker_impl.h"
#if defined(WEBRTC_MAC)
#include <dispatch/dispatch.h>
#endif
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/sequenced_task_checker.h"
+#include "webrtc/base/task_queue.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sequenced_task_checker_impl.h b/webrtc/rtc_base/sequenced_task_checker_impl.h
index ac43030..8b9ec4c 100644
--- a/webrtc/rtc_base/sequenced_task_checker_impl.h
+++ b/webrtc/rtc_base/sequenced_task_checker_impl.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
#define WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
-#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/base/thread_checker.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sequenced_task_checker_unittest.cc b/webrtc/rtc_base/sequenced_task_checker_unittest.cc
index 55fc474..ae6e09d 100644
--- a/webrtc/rtc_base/sequenced_task_checker_unittest.cc
+++ b/webrtc/rtc_base/sequenced_task_checker_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/sequenced_task_checker.h"
+#include "webrtc/base/task_queue.h"
#include "webrtc/test/gtest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sha1.cc b/webrtc/rtc_base/sha1.cc
index c12ebe0..5816152 100644
--- a/webrtc/rtc_base/sha1.cc
+++ b/webrtc/rtc_base/sha1.cc
@@ -107,7 +107,7 @@
// Disabling SHA1HANDSOFF the buffer will be modified (end swapped).
#define SHA1HANDSOFF
-#include "webrtc/rtc_base/sha1.h"
+#include "webrtc/base/sha1.h"
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/rtc_base/sha1digest.cc b/webrtc/rtc_base/sha1digest.cc
index cf4de93..c090a06 100644
--- a/webrtc/rtc_base/sha1digest.cc
+++ b/webrtc/rtc_base/sha1digest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sha1digest.h"
+#include "webrtc/base/sha1digest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sha1digest.h b/webrtc/rtc_base/sha1digest.h
index 2f939ce..bcd5514 100644
--- a/webrtc/rtc_base/sha1digest.h
+++ b/webrtc/rtc_base/sha1digest.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_RTC_BASE_SHA1DIGEST_H_
#define WEBRTC_RTC_BASE_SHA1DIGEST_H_
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/sha1.h"
+#include "webrtc/base/messagedigest.h"
+#include "webrtc/base/sha1.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sha1digest_unittest.cc b/webrtc/rtc_base/sha1digest_unittest.cc
index 24c30fa..d3c2043 100644
--- a/webrtc/rtc_base/sha1digest_unittest.cc
+++ b/webrtc/rtc_base/sha1digest_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sha1digest.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/sha1digest.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sigslot.cc b/webrtc/rtc_base/sigslot.cc
index 3f22af1..2fdb214 100644
--- a/webrtc/rtc_base/sigslot.cc
+++ b/webrtc/rtc_base/sigslot.cc
@@ -6,7 +6,7 @@
// the proviso that the author takes on no responsibility or liability for any
// use.
-#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/base/sigslot.h"
namespace sigslot {
diff --git a/webrtc/rtc_base/sigslot.h b/webrtc/rtc_base/sigslot.h
index ec4232c..2981b52 100644
--- a/webrtc/rtc_base/sigslot.h
+++ b/webrtc/rtc_base/sigslot.h
@@ -113,7 +113,7 @@
#if !defined(WIN32_LEAN_AND_MEAN)
#define WIN32_LEAN_AND_MEAN
#endif
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#elif defined(__GNUG__) || defined(SIGSLOT_USE_POSIX_THREADS)
#define _SIGSLOT_HAS_POSIX_THREADS
#include <pthread.h>
diff --git a/webrtc/rtc_base/sigslot_unittest.cc b/webrtc/rtc_base/sigslot_unittest.cc
index d538b0f..6d21d84 100644
--- a/webrtc/rtc_base/sigslot_unittest.cc
+++ b/webrtc/rtc_base/sigslot_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/base/sigslot.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
// This function, when passed a has_slots or signalx, will break the build if
// its threading requirement is not single threaded
diff --git a/webrtc/rtc_base/sigslottester.h b/webrtc/rtc_base/sigslottester.h
index ed6dadc..5eeb477 100755
--- a/webrtc/rtc_base/sigslottester.h
+++ b/webrtc/rtc_base/sigslottester.h
@@ -39,8 +39,8 @@
// EXPECT_EQ("hello", capture);
// /* See unit-tests for more examples */
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/sigslot.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sigslottester_unittest.cc b/webrtc/rtc_base/sigslottester_unittest.cc
index e0861d7..00b2577 100755
--- a/webrtc/rtc_base/sigslottester_unittest.cc
+++ b/webrtc/rtc_base/sigslottester_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sigslottester.h"
+#include "webrtc/base/sigslottester.h"
#include <string>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/sigslot.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socket.h b/webrtc/rtc_base/socket.h
index 2b2161d..9aed77e 100644
--- a/webrtc/rtc_base/socket.h
+++ b/webrtc/rtc_base/socket.h
@@ -22,12 +22,12 @@
#endif
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#endif
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/socketaddress.h"
// Rather than converting errors into a private namespace,
// Reuse the POSIX socket api errors. Note this depends on
diff --git a/webrtc/rtc_base/socket_unittest.cc b/webrtc/rtc_base/socket_unittest.cc
index 35bf2d1..2342007 100644
--- a/webrtc/rtc_base/socket_unittest.cc
+++ b/webrtc/rtc_base/socket_unittest.cc
@@ -10,18 +10,18 @@
#include <memory>
-#include "webrtc/rtc_base/socket_unittest.h"
+#include "webrtc/base/socket_unittest.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/asyncudpsocket.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/socketserver.h"
-#include "webrtc/rtc_base/testclient.h"
-#include "webrtc/rtc_base/testutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/ptr_util.h"
+#include "webrtc/base/socketserver.h"
+#include "webrtc/base/testclient.h"
+#include "webrtc/base/testutils.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socket_unittest.h b/webrtc/rtc_base/socket_unittest.h
index c236339..a92c7fd 100644
--- a/webrtc/rtc_base/socket_unittest.h
+++ b/webrtc/rtc_base/socket_unittest.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_RTC_BASE_SOCKET_UNITTEST_H_
#define WEBRTC_RTC_BASE_SOCKET_UNITTEST_H_
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketadapters.cc b/webrtc/rtc_base/socketadapters.cc
index 8519b89..060029c 100644
--- a/webrtc/rtc_base/socketadapters.cc
+++ b/webrtc/rtc_base/socketadapters.cc
@@ -26,13 +26,13 @@
#include <algorithm>
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/httpcommon.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/socketadapters.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/bytebuffer.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/httpcommon.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/socketadapters.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketadapters.h b/webrtc/rtc_base/socketadapters.h
index 34dd19b..a6c5c4e 100644
--- a/webrtc/rtc_base/socketadapters.h
+++ b/webrtc/rtc_base/socketadapters.h
@@ -14,10 +14,10 @@
#include <map>
#include <string>
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/cryptstring.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/cryptstring.h"
+#include "webrtc/base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddress.cc b/webrtc/rtc_base/socketaddress.cc
index 5b26b9f..d931f72 100644
--- a/webrtc/rtc_base/socketaddress.cc
+++ b/webrtc/rtc_base/socketaddress.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/base/socketaddress.h"
#if defined(WEBRTC_POSIX)
#include <sys/types.h>
@@ -27,13 +27,13 @@
#include <sstream>
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/nethelpers.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddress.h b/webrtc/rtc_base/socketaddress.h
index 617e355..dd64ae9 100644
--- a/webrtc/rtc_base/socketaddress.h
+++ b/webrtc/rtc_base/socketaddress.h
@@ -11,11 +11,11 @@
#ifndef WEBRTC_RTC_BASE_SOCKETADDRESS_H_
#define WEBRTC_RTC_BASE_SOCKETADDRESS_H_
-#include <iosfwd>
#include <string>
#include <vector>
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/ipaddress.h"
+#include <iosfwd>
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/ipaddress.h"
#undef SetPort
diff --git a/webrtc/rtc_base/socketaddress_unittest.cc b/webrtc/rtc_base/socketaddress_unittest.cc
index 19fbc50..072918e 100644
--- a/webrtc/rtc_base/socketaddress_unittest.cc
+++ b/webrtc/rtc_base/socketaddress_unittest.cc
@@ -12,9 +12,9 @@
#include <netinet/in.h> // for sockaddr_in
#endif
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/ipaddress.h"
-#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/ipaddress.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddresspair.cc b/webrtc/rtc_base/socketaddresspair.cc
index 2be718f..dfa8b25 100644
--- a/webrtc/rtc_base/socketaddresspair.cc
+++ b/webrtc/rtc_base/socketaddresspair.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/socketaddresspair.h"
+#include "webrtc/base/socketaddresspair.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddresspair.h b/webrtc/rtc_base/socketaddresspair.h
index cec84a7..91137a3 100644
--- a/webrtc/rtc_base/socketaddresspair.h
+++ b/webrtc/rtc_base/socketaddresspair.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_RTC_BASE_SOCKETADDRESSPAIR_H_
#define WEBRTC_RTC_BASE_SOCKETADDRESSPAIR_H_
-#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/base/socketaddress.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketfactory.h b/webrtc/rtc_base/socketfactory.h
index 749eb17..1280264 100644
--- a/webrtc/rtc_base/socketfactory.h
+++ b/webrtc/rtc_base/socketfactory.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_RTC_BASE_SOCKETFACTORY_H_
#define WEBRTC_RTC_BASE_SOCKETFACTORY_H_
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/socket.h"
+#include "webrtc/base/socket.h"
+#include "webrtc/base/asyncsocket.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketserver.h b/webrtc/rtc_base/socketserver.h
index dc99c2b..6d06f2f 100644
--- a/webrtc/rtc_base/socketserver.h
+++ b/webrtc/rtc_base/socketserver.h
@@ -12,7 +12,7 @@
#define WEBRTC_RTC_BASE_SOCKETSERVER_H_
#include <memory>
-#include "webrtc/rtc_base/socketfactory.h"
+#include "webrtc/base/socketfactory.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketstream.cc b/webrtc/rtc_base/socketstream.cc
index 2c09fcf..a218dd8 100644
--- a/webrtc/rtc_base/socketstream.cc
+++ b/webrtc/rtc_base/socketstream.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/socketstream.h"
+#include "webrtc/base/socketstream.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketstream.h b/webrtc/rtc_base/socketstream.h
index e78c876..7991c61 100644
--- a/webrtc/rtc_base/socketstream.h
+++ b/webrtc/rtc_base/socketstream.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_RTC_BASE_SOCKETSTREAM_H_
#define WEBRTC_RTC_BASE_SOCKETSTREAM_H_
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/stream.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/stream.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ssladapter.cc b/webrtc/rtc_base/ssladapter.cc
index 07a13b5..06fce54 100644
--- a/webrtc/rtc_base/ssladapter.cc
+++ b/webrtc/rtc_base/ssladapter.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/base/ssladapter.h"
-#include "webrtc/rtc_base/openssladapter.h"
+#include "webrtc/base/openssladapter.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/rtc_base/ssladapter.h b/webrtc/rtc_base/ssladapter.h
index dccb6d1..7e03c4f 100644
--- a/webrtc/rtc_base/ssladapter.h
+++ b/webrtc/rtc_base/ssladapter.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_RTC_BASE_SSLADAPTER_H_
#define WEBRTC_RTC_BASE_SSLADAPTER_H_
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/sslstreamadapter.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ssladapter_unittest.cc b/webrtc/rtc_base/ssladapter_unittest.cc
index 929b14f..0eaac17 100644
--- a/webrtc/rtc_base/ssladapter_unittest.cc
+++ b/webrtc/rtc_base/ssladapter_unittest.cc
@@ -11,15 +11,15 @@
#include <memory>
#include <string>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/ipaddress.h"
-#include "webrtc/rtc_base/socketstream.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/ipaddress.h"
+#include "webrtc/base/socketstream.h"
+#include "webrtc/base/ssladapter.h"
+#include "webrtc/base/sslidentity.h"
+#include "webrtc/base/sslstreamadapter.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/virtualsocketserver.h"
static const int kTimeout = 5000;
diff --git a/webrtc/rtc_base/sslfingerprint.cc b/webrtc/rtc_base/sslfingerprint.cc
index adf3851..bd15743 100644
--- a/webrtc/rtc_base/sslfingerprint.cc
+++ b/webrtc/rtc_base/sslfingerprint.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sslfingerprint.h"
+#include "webrtc/base/sslfingerprint.h"
#include <ctype.h>
#include <string>
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/messagedigest.h"
+#include "webrtc/base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslfingerprint.h b/webrtc/rtc_base/sslfingerprint.h
index 557ac56..4effca6 100644
--- a/webrtc/rtc_base/sslfingerprint.h
+++ b/webrtc/rtc_base/sslfingerprint.h
@@ -13,10 +13,10 @@
#include <string>
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/rtccertificate.h"
-#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/copyonwritebuffer.h"
+#include "webrtc/base/rtccertificate.h"
+#include "webrtc/base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslidentity.cc b/webrtc/rtc_base/sslidentity.cc
index 38c27ca..a5dd7b9 100644
--- a/webrtc/rtc_base/sslidentity.cc
+++ b/webrtc/rtc_base/sslidentity.cc
@@ -9,16 +9,16 @@
*/
// Handling of certificates and keypairs for SSLStreamAdapter's peer mode.
-#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/base/sslidentity.h"
#include <ctime>
#include <string>
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/opensslidentity.h"
-#include "webrtc/rtc_base/sslfingerprint.h"
+#include "webrtc/base/base64.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/opensslidentity.h"
+#include "webrtc/base/sslfingerprint.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslidentity.h b/webrtc/rtc_base/sslidentity.h
index e6ac527..f84f725 100644
--- a/webrtc/rtc_base/sslidentity.h
+++ b/webrtc/rtc_base/sslidentity.h
@@ -18,10 +18,10 @@
#include <string>
#include <vector>
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/messagedigest.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslidentity_unittest.cc b/webrtc/rtc_base/sslidentity_unittest.cc
index 9b90b4c..5c881c2 100644
--- a/webrtc/rtc_base/sslidentity_unittest.cc
+++ b/webrtc/rtc_base/sslidentity_unittest.cc
@@ -11,13 +11,13 @@
#include <memory>
#include <string>
-#include "webrtc/rtc_base/fakesslidentity.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslfingerprint.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/fakesslidentity.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/ssladapter.h"
+#include "webrtc/base/sslfingerprint.h"
+#include "webrtc/base/sslidentity.h"
+#include "webrtc/base/stringutils.h"
using rtc::SSLIdentity;
diff --git a/webrtc/rtc_base/sslstreamadapter.cc b/webrtc/rtc_base/sslstreamadapter.cc
index d55b6fe..0927704 100644
--- a/webrtc/rtc_base/sslstreamadapter.cc
+++ b/webrtc/rtc_base/sslstreamadapter.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/rtc_base/opensslstreamadapter.h"
+#include "webrtc/base/opensslstreamadapter.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/rtc_base/sslstreamadapter.h b/webrtc/rtc_base/sslstreamadapter.h
index 7fb0867..889b634 100644
--- a/webrtc/rtc_base/sslstreamadapter.h
+++ b/webrtc/rtc_base/sslstreamadapter.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/stream.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslstreamadapter_unittest.cc b/webrtc/rtc_base/sslstreamadapter_unittest.cc
index a2d63e8..b5184e6 100644
--- a/webrtc/rtc_base/sslstreamadapter_unittest.cc
+++ b/webrtc/rtc_base/sslstreamadapter_unittest.cc
@@ -14,14 +14,14 @@
#include <set>
#include <string>
-#include "webrtc/rtc_base/bufferqueue.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/rtc_base/stream.h"
+#include "webrtc/base/bufferqueue.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/ssladapter.h"
+#include "webrtc/base/sslidentity.h"
+#include "webrtc/base/sslstreamadapter.h"
+#include "webrtc/base/stream.h"
using ::testing::WithParamInterface;
using ::testing::Values;
diff --git a/webrtc/rtc_base/stream.cc b/webrtc/rtc_base/stream.cc
index df2d665..67ef104 100644
--- a/webrtc/rtc_base/stream.cc
+++ b/webrtc/rtc_base/stream.cc
@@ -18,18 +18,18 @@
#include <algorithm>
#include <string>
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/messagequeue.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/timeutils.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#define fileno _fileno
#endif
diff --git a/webrtc/rtc_base/stream.h b/webrtc/rtc_base/stream.h
index 601ef66..c03867d 100644
--- a/webrtc/rtc_base/stream.h
+++ b/webrtc/rtc_base/stream.h
@@ -15,13 +15,13 @@
#include <memory>
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/messagequeue.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/sigslot.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stream_unittest.cc b/webrtc/rtc_base/stream_unittest.cc
index 0f8fbf1..0fbb6ab 100644
--- a/webrtc/rtc_base/stream_unittest.cc
+++ b/webrtc/rtc_base/stream_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stream.h"
namespace rtc {
diff --git a/webrtc/rtc_base/string_to_number.cc b/webrtc/rtc_base/string_to_number.cc
index 06107f5..b8e969d 100644
--- a/webrtc/rtc_base/string_to_number.cc
+++ b/webrtc/rtc_base/string_to_number.cc
@@ -11,7 +11,7 @@
#include <cerrno>
#include <cstdlib>
-#include "webrtc/rtc_base/string_to_number.h"
+#include "webrtc/base/string_to_number.h"
namespace rtc {
namespace string_to_number_internal {
diff --git a/webrtc/rtc_base/string_to_number.h b/webrtc/rtc_base/string_to_number.h
index c61d1ed..4dcddf5 100644
--- a/webrtc/rtc_base/string_to_number.h
+++ b/webrtc/rtc_base/string_to_number.h
@@ -14,7 +14,7 @@
#include <string>
#include <limits>
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/optional.h"
namespace rtc {
diff --git a/webrtc/rtc_base/string_to_number_unittest.cc b/webrtc/rtc_base/string_to_number_unittest.cc
index 2c1aece..00ebd4c 100644
--- a/webrtc/rtc_base/string_to_number_unittest.cc
+++ b/webrtc/rtc_base/string_to_number_unittest.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/string_to_number.h"
+#include "webrtc/base/string_to_number.h"
#include <string>
#include <type_traits>
#include <limits>
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringencode.cc b/webrtc/rtc_base/stringencode.cc
index 93470b6..c7d206f 100644
--- a/webrtc/rtc_base/stringencode.cc
+++ b/webrtc/rtc_base/stringencode.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/stringencode.h"
#include <stdio.h>
#include <stdlib.h>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringencode.h b/webrtc/rtc_base/stringencode.h
index 5296a9c..668947d 100644
--- a/webrtc/rtc_base/stringencode.h
+++ b/webrtc/rtc_base/stringencode.h
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringencode_unittest.cc b/webrtc/rtc_base/stringencode_unittest.cc
index 36071ed..60929f3 100644
--- a/webrtc/rtc_base/stringencode_unittest.cc
+++ b/webrtc/rtc_base/stringencode_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringize_macros_unittest.cc b/webrtc/rtc_base/stringize_macros_unittest.cc
index bb3a0f6..d0ba113 100644
--- a/webrtc/rtc_base/stringize_macros_unittest.cc
+++ b/webrtc/rtc_base/stringize_macros_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/stringize_macros.h"
+#include "webrtc/base/stringize_macros.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/rtc_base/stringutils.cc b/webrtc/rtc_base/stringutils.cc
index b47bb16..eca1362 100644
--- a/webrtc/rtc_base/stringutils.cc
+++ b/webrtc/rtc_base/stringutils.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringutils_unittest.cc b/webrtc/rtc_base/stringutils_unittest.cc
index 7689b83..7d5b8e2 100644
--- a/webrtc/rtc_base/stringutils_unittest.cc
+++ b/webrtc/rtc_base/stringutils_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/swap_queue.h b/webrtc/rtc_base/swap_queue.h
index 3519686..8c65278 100644
--- a/webrtc/rtc_base/swap_queue.h
+++ b/webrtc/rtc_base/swap_queue.h
@@ -15,9 +15,9 @@
#include <utility>
#include <vector>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/swap_queue_unittest.cc b/webrtc/rtc_base/swap_queue_unittest.cc
index ceda7eb..ff00626 100644
--- a/webrtc/rtc_base/swap_queue_unittest.cc
+++ b/webrtc/rtc_base/swap_queue_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/swap_queue.h"
+#include "webrtc/base/swap_queue.h"
#include <vector>
diff --git a/webrtc/rtc_base/task_queue.h b/webrtc/rtc_base/task_queue.h
index 218fce9..4c43b23 100644
--- a/webrtc/rtc_base/task_queue.h
+++ b/webrtc/rtc_base/task_queue.h
@@ -19,16 +19,16 @@
#include <dispatch/dispatch.h>
#endif
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
#if defined(WEBRTC_WIN) || defined(WEBRTC_BUILD_LIBEVENT)
-#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/base/platform_thread.h"
#endif
#if defined(WEBRTC_BUILD_LIBEVENT)
-#include "webrtc/rtc_base/refcountedobject.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/refcountedobject.h"
+#include "webrtc/base/scoped_ref_ptr.h"
struct event_base;
struct event;
diff --git a/webrtc/rtc_base/task_queue_gcd.cc b/webrtc/rtc_base/task_queue_gcd.cc
index 45c5f09..296da16 100644
--- a/webrtc/rtc_base/task_queue_gcd.cc
+++ b/webrtc/rtc_base/task_queue_gcd.cc
@@ -12,13 +12,13 @@
// The implementation uses Grand Central Dispatch queues (GCD) to
// do the actual task queuing.
-#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/base/task_queue.h"
#include <string.h>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/task_queue_posix.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/task_queue_posix.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/task_queue_libevent.cc b/webrtc/rtc_base/task_queue_libevent.cc
index b1070da..1376ea3 100644
--- a/webrtc/rtc_base/task_queue_libevent.cc
+++ b/webrtc/rtc_base/task_queue_libevent.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/base/task_queue.h"
#include <fcntl.h>
#include <signal.h>
@@ -16,10 +16,10 @@
#include <unistd.h>
#include "base/third_party/libevent/event.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/task_queue_posix.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/task_queue_posix.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
using internal::GetQueuePtrTls;
diff --git a/webrtc/rtc_base/task_queue_posix.cc b/webrtc/rtc_base/task_queue_posix.cc
index 89956f1..3b00ac8 100644
--- a/webrtc/rtc_base/task_queue_posix.cc
+++ b/webrtc/rtc_base/task_queue_posix.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/task_queue_posix.h"
+#include "webrtc/base/task_queue_posix.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/task_queue.h"
namespace rtc {
namespace internal {
diff --git a/webrtc/rtc_base/task_queue_unittest.cc b/webrtc/rtc_base/task_queue_unittest.cc
index fbaf6d5..856249d 100644
--- a/webrtc/rtc_base/task_queue_unittest.cc
+++ b/webrtc/rtc_base/task_queue_unittest.cc
@@ -18,11 +18,11 @@
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/task_queue.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/task_queue_win.cc b/webrtc/rtc_base/task_queue_win.cc
index 128a98f..a149dd8 100644
--- a/webrtc/rtc_base/task_queue_win.cc
+++ b/webrtc/rtc_base/task_queue_win.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/base/task_queue.h"
#include <mmsystem.h>
#include <string.h>
@@ -16,11 +16,11 @@
#include <algorithm>
#include <queue>
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/testclient.cc b/webrtc/rtc_base/testclient.cc
index a54122c..b6fd692 100644
--- a/webrtc/rtc_base/testclient.cc
+++ b/webrtc/rtc_base/testclient.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/testclient.h"
+#include "webrtc/base/testclient.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/ptr_util.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/testclient.h b/webrtc/rtc_base/testclient.h
index 18fe71a..b15657b 100644
--- a/webrtc/rtc_base/testclient.h
+++ b/webrtc/rtc_base/testclient.h
@@ -13,10 +13,10 @@
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/asyncudpsocket.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/fakeclock.h"
namespace rtc {
diff --git a/webrtc/rtc_base/testclient_unittest.cc b/webrtc/rtc_base/testclient_unittest.cc
index 2607dbb..8392abf 100644
--- a/webrtc/rtc_base/testclient_unittest.cc
+++ b/webrtc/rtc_base/testclient_unittest.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/testclient.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/physicalsocketserver.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/testechoserver.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/testclient.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/ptr_util.h"
+#include "webrtc/base/testechoserver.h"
+#include "webrtc/base/thread.h"
using namespace rtc;
diff --git a/webrtc/rtc_base/testechoserver.h b/webrtc/rtc_base/testechoserver.h
index e115332..2ec46aa 100644
--- a/webrtc/rtc_base/testechoserver.h
+++ b/webrtc/rtc_base/testechoserver.h
@@ -13,11 +13,11 @@
#include <list>
#include <memory>
-#include "webrtc/rtc_base/asynctcpsocket.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/asynctcpsocket.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/testutils.h b/webrtc/rtc_base/testutils.h
index 615f094..e66c072 100644
--- a/webrtc/rtc_base/testutils.h
+++ b/webrtc/rtc_base/testutils.h
@@ -26,16 +26,16 @@
#include <map>
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/thread.h"
namespace webrtc {
namespace testing {
diff --git a/webrtc/rtc_base/thread.cc b/webrtc/rtc_base/thread.cc
index 56a145c..9174cd1 100644
--- a/webrtc/rtc_base/thread.cc
+++ b/webrtc/rtc_base/thread.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/thread.h"
#if defined(WEBRTC_WIN)
#include <comdef.h>
@@ -16,13 +16,13 @@
#include <time.h>
#endif
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/nullsocketserver.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/logging.h"
+#include "webrtc/base/nullsocketserver.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/trace_event.h"
namespace rtc {
@@ -469,7 +469,7 @@
#if !defined(WEBRTC_MAC)
// Note that these methods have a separate implementation for mac and ios
-// defined in webrtc/rtc_base/thread_darwin.mm.
+// defined in webrtc/base/thread_darwin.mm.
bool Thread::ProcessMessages(int cmsLoop) {
// Using ProcessMessages with a custom clock for testing and a time greater
// than 0 doesn't work, since it's not guaranteed to advance the custom
diff --git a/webrtc/rtc_base/thread.h b/webrtc/rtc_base/thread.h
index 35b28ea..b6e98fa 100644
--- a/webrtc/rtc_base/thread.h
+++ b/webrtc/rtc_base/thread.h
@@ -20,13 +20,13 @@
#if defined(WEBRTC_POSIX)
#include <pthread.h>
#endif
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/messagequeue.h"
-#include "webrtc/rtc_base/platform_thread_types.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/platform_thread_types.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/thread_annotations_unittest.cc b/webrtc/rtc_base/thread_annotations_unittest.cc
index a8ff014e..69938ef 100644
--- a/webrtc/rtc_base/thread_annotations_unittest.cc
+++ b/webrtc/rtc_base/thread_annotations_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/base/thread_annotations.h"
#include "webrtc/test/gtest.h"
namespace {
diff --git a/webrtc/rtc_base/thread_checker.h b/webrtc/rtc_base/thread_checker.h
index b6ce017..4ab538f 100644
--- a/webrtc/rtc_base/thread_checker.h
+++ b/webrtc/rtc_base/thread_checker.h
@@ -19,10 +19,10 @@
// debug bots.
#define ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/rtc_base/thread_checker_impl.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/thread_annotations.h"
+#include "webrtc/base/thread_checker_impl.h"
namespace rtc {
diff --git a/webrtc/rtc_base/thread_checker_impl.cc b/webrtc/rtc_base/thread_checker_impl.cc
index 307d6f8..79be606 100644
--- a/webrtc/rtc_base/thread_checker_impl.cc
+++ b/webrtc/rtc_base/thread_checker_impl.cc
@@ -10,9 +10,9 @@
// Borrowed from Chromium's src/base/threading/thread_checker_impl.cc.
-#include "webrtc/rtc_base/thread_checker_impl.h"
+#include "webrtc/base/thread_checker_impl.h"
-#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/base/platform_thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/thread_checker_impl.h b/webrtc/rtc_base/thread_checker_impl.h
index 628e9b3..05b1b62 100644
--- a/webrtc/rtc_base/thread_checker_impl.h
+++ b/webrtc/rtc_base/thread_checker_impl.h
@@ -13,8 +13,8 @@
#ifndef WEBRTC_RTC_BASE_THREAD_CHECKER_IMPL_H_
#define WEBRTC_RTC_BASE_THREAD_CHECKER_IMPL_H_
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/platform_thread_types.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/platform_thread_types.h"
namespace rtc {
diff --git a/webrtc/rtc_base/thread_checker_unittest.cc b/webrtc/rtc_base/thread_checker_unittest.cc
index 42e1fcc..e995b50 100644
--- a/webrtc/rtc_base/thread_checker_unittest.cc
+++ b/webrtc/rtc_base/thread_checker_unittest.cc
@@ -12,11 +12,11 @@
#include <memory>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/task_queue.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/thread_checker.h"
#include "webrtc/test/gtest.h"
// Duplicated from base/threading/thread_checker.h so that we can be
diff --git a/webrtc/rtc_base/thread_unittest.cc b/webrtc/rtc_base/thread_unittest.cc
index db7d038..c143120 100644
--- a/webrtc/rtc_base/thread_unittest.cc
+++ b/webrtc/rtc_base/thread_unittest.cc
@@ -10,14 +10,14 @@
#include <memory>
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/asyncudpsocket.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/physicalsocketserver.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/asyncinvoker.h"
+#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/thread.h"
#if defined(WEBRTC_WIN)
#include <comdef.h> // NOLINT
diff --git a/webrtc/rtc_base/timedelta.h b/webrtc/rtc_base/timedelta.h
index ae4bda4..49008ba 100644
--- a/webrtc/rtc_base/timedelta.h
+++ b/webrtc/rtc_base/timedelta.h
@@ -13,7 +13,7 @@
#include <stdint.h>
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/timeutils.h"
// Convenience class to convert between different units of relative time.
// Stores time to precision of nanoseconds, as int64_t internally.
diff --git a/webrtc/rtc_base/timestampaligner.cc b/webrtc/rtc_base/timestampaligner.cc
index fdce141..281da8f 100644
--- a/webrtc/rtc_base/timestampaligner.cc
+++ b/webrtc/rtc_base/timestampaligner.cc
@@ -10,10 +10,10 @@
#include <limits>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timestampaligner.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/timestampaligner.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timestampaligner.h b/webrtc/rtc_base/timestampaligner.h
index dde877c..90db4b99 100644
--- a/webrtc/rtc_base/timestampaligner.h
+++ b/webrtc/rtc_base/timestampaligner.h
@@ -13,7 +13,7 @@
#include <stdint.h>
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timestampaligner_unittest.cc b/webrtc/rtc_base/timestampaligner_unittest.cc
index 0c838af..a4c0e5a 100644
--- a/webrtc/rtc_base/timestampaligner_unittest.cc
+++ b/webrtc/rtc_base/timestampaligner_unittest.cc
@@ -13,9 +13,9 @@
#include <algorithm>
#include <limits>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/random.h"
-#include "webrtc/rtc_base/timestampaligner.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/random.h"
+#include "webrtc/base/timestampaligner.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timeutils.cc b/webrtc/rtc_base/timeutils.cc
index 36f9d3f..ee1415f 100644
--- a/webrtc/rtc_base/timeutils.cc
+++ b/webrtc/rtc_base/timeutils.cc
@@ -26,8 +26,8 @@
#include <sys/timeb.h>
#endif
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timeutils_unittest.cc b/webrtc/rtc_base/timeutils_unittest.cc
index 5fd9436..bac26c1 100644
--- a/webrtc/rtc_base/timeutils_unittest.cc
+++ b/webrtc/rtc_base/timeutils_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/fakeclock.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/trace_event.h b/webrtc/rtc_base/trace_event.h
index 98f6afa..fd48eae 100644
--- a/webrtc/rtc_base/trace_event.h
+++ b/webrtc/rtc_base/trace_event.h
@@ -8,7 +8,7 @@
#include <string>
-#include "webrtc/rtc_base/event_tracer.h"
+#include "webrtc/base/event_tracer.h"
#if defined(TRACE_EVENT0)
#error "Another copy of trace_event.h has already been included."
diff --git a/webrtc/rtc_base/transformadapter.cc b/webrtc/rtc_base/transformadapter.cc
index 3243e6d..1f1a2a0 100644
--- a/webrtc/rtc_base/transformadapter.cc
+++ b/webrtc/rtc_base/transformadapter.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/transformadapter.h"
+#include "webrtc/base/transformadapter.h"
#include <string.h>
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/transformadapter.h b/webrtc/rtc_base/transformadapter.h
index 21e11ed..0818899 100644
--- a/webrtc/rtc_base/transformadapter.h
+++ b/webrtc/rtc_base/transformadapter.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_RTC_BASE_TRANSFORMADAPTER_H_
#define WEBRTC_RTC_BASE_TRANSFORMADAPTER_H_
-#include "webrtc/rtc_base/stream.h"
+#include "webrtc/base/stream.h"
namespace rtc {
///////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/rtc_base/unittest_main.cc b/webrtc/rtc_base/unittest_main.cc
index b7738c6..2f8f52c 100644
--- a/webrtc/rtc_base/unittest_main.cc
+++ b/webrtc/rtc_base/unittest_main.cc
@@ -14,12 +14,12 @@
#include <crtdbg.h>
#endif
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/base/flags.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/ssladapter.h"
+#include "webrtc/base/sslstreamadapter.h"
#include "webrtc/test/field_trial.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/rtc_base/unixfilesystem.cc b/webrtc/rtc_base/unixfilesystem.cc
index 345c602..4901412 100644
--- a/webrtc/rtc_base/unixfilesystem.cc
+++ b/webrtc/rtc_base/unixfilesystem.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/unixfilesystem.h"
+#include "webrtc/base/unixfilesystem.h"
#include <errno.h>
#include <fcntl.h>
@@ -20,7 +20,7 @@
#include <CoreServices/CoreServices.h>
#include <IOKit/IOCFBundle.h>
#include <sys/statvfs.h>
-#include "webrtc/rtc_base/macutils.h"
+#include "webrtc/base/macutils.h"
#endif // WEBRTC_MAC && !defined(WEBRTC_IOS)
#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
@@ -44,12 +44,12 @@
#include <sys/syslimits.h>
#endif
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/stringutils.h"
#if defined(WEBRTC_MAC)
// Defined in applefilesystem.mm. No header file to discourage use
diff --git a/webrtc/rtc_base/unixfilesystem.h b/webrtc/rtc_base/unixfilesystem.h
index 0ed36b4..eb58a4d 100644
--- a/webrtc/rtc_base/unixfilesystem.h
+++ b/webrtc/rtc_base/unixfilesystem.h
@@ -13,7 +13,7 @@
#include <sys/types.h>
-#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/base/fileutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/virtualsocket_unittest.cc b/webrtc/rtc_base/virtualsocket_unittest.cc
index b58bdd8..34ee036 100644
--- a/webrtc/rtc_base/virtualsocket_unittest.cc
+++ b/webrtc/rtc_base/virtualsocket_unittest.cc
@@ -16,16 +16,16 @@
#include <memory>
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/testclient.h"
-#include "webrtc/rtc_base/testutils.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/fakeclock.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/ptr_util.h"
+#include "webrtc/base/testclient.h"
+#include "webrtc/base/testutils.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/timeutils.h"
+#include "webrtc/base/virtualsocketserver.h"
using namespace rtc;
diff --git a/webrtc/rtc_base/virtualsocketserver.cc b/webrtc/rtc_base/virtualsocketserver.cc
index e47b01b..a7e2d30 100644
--- a/webrtc/rtc_base/virtualsocketserver.cc
+++ b/webrtc/rtc_base/virtualsocketserver.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "webrtc/base/virtualsocketserver.h"
#include <errno.h>
#include <math.h>
@@ -18,13 +18,13 @@
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/physicalsocketserver.h"
-#include "webrtc/rtc_base/socketaddresspair.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/fakeclock.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/physicalsocketserver.h"
+#include "webrtc/base/socketaddresspair.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/timeutils.h"
namespace rtc {
#if defined(WEBRTC_WIN)
diff --git a/webrtc/rtc_base/virtualsocketserver.h b/webrtc/rtc_base/virtualsocketserver.h
index a08bc0c..4de12c7 100644
--- a/webrtc/rtc_base/virtualsocketserver.h
+++ b/webrtc/rtc_base/virtualsocketserver.h
@@ -14,12 +14,12 @@
#include <deque>
#include <map>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/messagequeue.h"
-#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/fakeclock.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/socketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/weak_ptr.cc b/webrtc/rtc_base/weak_ptr.cc
index 3693a94..8a07a87 100644
--- a/webrtc/rtc_base/weak_ptr.cc
+++ b/webrtc/rtc_base/weak_ptr.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/weak_ptr.h"
+#include "webrtc/base/weak_ptr.h"
// The implementation is borrowed from chromium except that it does not
// implement SupportsWeakPtr.
diff --git a/webrtc/rtc_base/weak_ptr.h b/webrtc/rtc_base/weak_ptr.h
index 0e82612..62c97d9 100644
--- a/webrtc/rtc_base/weak_ptr.h
+++ b/webrtc/rtc_base/weak_ptr.h
@@ -15,9 +15,9 @@
#include <utility>
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/base/sequenced_task_checker.h"
// The implementation is borrowed from chromium except that it does not
// implement SupportsWeakPtr.
diff --git a/webrtc/rtc_base/weak_ptr_unittest.cc b/webrtc/rtc_base/weak_ptr_unittest.cc
index d6da234..a3cd1f8 100644
--- a/webrtc/rtc_base/weak_ptr_unittest.cc
+++ b/webrtc/rtc_base/weak_ptr_unittest.cc
@@ -10,9 +10,9 @@
#include <string>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/weak_ptr.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/task_queue.h"
+#include "webrtc/base/weak_ptr.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32.cc b/webrtc/rtc_base/win32.cc
index 276b74b..89970ec 100644
--- a/webrtc/rtc_base/win32.cc
+++ b/webrtc/rtc_base/win32.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
#include <winsock2.h>
#include <ws2tcpip.h>
#include <algorithm>
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32.h b/webrtc/rtc_base/win32.h
index be1195e..b4c7646 100644
--- a/webrtc/rtc_base/win32.h
+++ b/webrtc/rtc_base/win32.h
@@ -38,8 +38,8 @@
#include <string>
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/base/basictypes.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32_unittest.cc b/webrtc/rtc_base/win32_unittest.cc
index 831b4b3..c41ca86 100644
--- a/webrtc/rtc_base/win32_unittest.cc
+++ b/webrtc/rtc_base/win32_unittest.cc
@@ -10,9 +10,9 @@
#include <string>
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/nethelpers.h"
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/nethelpers.h"
+#include "webrtc/base/win32.h"
#if !defined(WEBRTC_WIN)
#error Only for Windows
diff --git a/webrtc/rtc_base/win32filesystem.cc b/webrtc/rtc_base/win32filesystem.cc
index 973280e..5445140 100644
--- a/webrtc/rtc_base/win32filesystem.cc
+++ b/webrtc/rtc_base/win32filesystem.cc
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/win32filesystem.h"
+#include "webrtc/base/win32filesystem.h"
+#include "webrtc/base/win32.h"
#include <shellapi.h>
#include <shlobj.h>
#include <tchar.h>
-#include "webrtc/rtc_base/win32.h"
#include <memory>
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/stream.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/stream.h"
+#include "webrtc/base/stringutils.h"
// In several places in this file, we test the integrity level of the process
// before calling GetLongPathName. We do this because calling GetLongPathName
diff --git a/webrtc/rtc_base/win32securityerrors.cc b/webrtc/rtc_base/win32securityerrors.cc
index 0cc9bce..71fe466 100644
--- a/webrtc/rtc_base/win32securityerrors.cc
+++ b/webrtc/rtc_base/win32securityerrors.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
+#include "webrtc/base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketinit.cc b/webrtc/rtc_base/win32socketinit.cc
index 1a54c44..02a6c26 100644
--- a/webrtc/rtc_base/win32socketinit.cc
+++ b/webrtc/rtc_base/win32socketinit.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/win32socketinit.h"
+#include "webrtc/base/win32socketinit.h"
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketserver.cc b/webrtc/rtc_base/win32socketserver.cc
index 1405c82..daec986 100644
--- a/webrtc/rtc_base/win32socketserver.cc
+++ b/webrtc/rtc_base/win32socketserver.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/win32socketserver.h"
+#include "webrtc/base/win32socketserver.h"
#include <algorithm>
#include <ws2tcpip.h> // NOLINT
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/win32window.h"
+#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/win32window.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketserver.h b/webrtc/rtc_base/win32socketserver.h
index 1255a80..adb621c 100644
--- a/webrtc/rtc_base/win32socketserver.h
+++ b/webrtc/rtc_base/win32socketserver.h
@@ -12,14 +12,14 @@
#define WEBRTC_RTC_BASE_WIN32SOCKETSERVER_H_
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/asyncsocket.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/messagequeue.h"
-#include "webrtc/rtc_base/socket.h"
-#include "webrtc/rtc_base/socketfactory.h"
-#include "webrtc/rtc_base/socketserver.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/win32window.h"
+#include "webrtc/base/asyncsocket.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/socketserver.h"
+#include "webrtc/base/socketfactory.h"
+#include "webrtc/base/socket.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/win32window.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketserver_unittest.cc b/webrtc/rtc_base/win32socketserver_unittest.cc
index 9eacff7..7211cd7 100644
--- a/webrtc/rtc_base/win32socketserver_unittest.cc
+++ b/webrtc/rtc_base/win32socketserver_unittest.cc
@@ -7,10 +7,10 @@
* 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/win32socketserver.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/socket_unittest.h"
-#include "webrtc/rtc_base/thread.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/socket_unittest.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/win32socketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32window.cc b/webrtc/rtc_base/win32window.cc
index e005ba1..0e02eef 100644
--- a/webrtc/rtc_base/win32window.cc
+++ b/webrtc/rtc_base/win32window.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/win32window.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/win32window.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32window.h b/webrtc/rtc_base/win32window.h
index a9fe843..2243a52 100644
--- a/webrtc/rtc_base/win32window.h
+++ b/webrtc/rtc_base/win32window.h
@@ -13,7 +13,7 @@
#if defined(WEBRTC_WIN)
-#include "webrtc/rtc_base/win32.h"
+#include "webrtc/base/win32.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32window_unittest.cc b/webrtc/rtc_base/win32window_unittest.cc
index 9bd2d34..f814752 100644
--- a/webrtc/rtc_base/win32window_unittest.cc
+++ b/webrtc/rtc_base/win32window_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/win32window.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/win32window.h"
+#include "webrtc/base/logging.h"
static LRESULT kDummyResult = 0x1234ABCD;
diff --git a/webrtc/rtc_base/window.h b/webrtc/rtc_base/window.h
index 10ed9f7..2eed4be 100644
--- a/webrtc/rtc_base/window.h
+++ b/webrtc/rtc_base/window.h
@@ -13,14 +13,14 @@
#include <stdint.h>
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/stringencode.h"
// Define platform specific window types.
#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
typedef unsigned long Window; // Avoid include <X11/Xlib.h>.
#elif defined(WEBRTC_WIN)
-// We commonly include win32.h in webrtc/rtc_base so just include it here.
-#include "webrtc/rtc_base/win32.h" // Include HWND, HMONITOR.
+// We commonly include win32.h in webrtc/base so just include it here.
+#include "webrtc/base/win32.h" // Include HWND, HMONITOR.
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
typedef unsigned int CGWindowID;
typedef unsigned int CGDirectDisplayID;
