Update includes for webrtc/{base => rtc_base} rename (3/3)
I used a command like this to update the paths:
perl -pi -e "s/webrtc\/base/webrtc\/rtc_base/g" `find webrtc/rtc_base -name "*.cc" -o -name "*.h"`
BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True
TBR=kwiberg@webrtc.org
Review-Url: https://codereview.webrtc.org/2963273002
Cr-Commit-Position: refs/heads/master@{#18856}
diff --git a/webrtc/rtc_base/array_view.h b/webrtc/rtc_base/array_view.h
index 0f0e3f3..afc6999 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/base/checks.h"
-#include "webrtc/base/type_traits.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_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 035f25c..6c30bef 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/base/array_view.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
+#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/test/gmock.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncinvoker-inl.h b/webrtc/rtc_base/asyncinvoker-inl.h
index 427d76df..5b2cf4e 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncinvoker.cc b/webrtc/rtc_base/asyncinvoker.cc
index bfd1317..94abfd5 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/base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncinvoker.h b/webrtc/rtc_base/asyncinvoker.h
index 03e5724..17d702a 100644
--- a/webrtc/rtc_base/asyncinvoker.h
+++ b/webrtc/rtc_base/asyncinvoker.h
@@ -14,12 +14,12 @@
#include <memory>
#include <utility>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncpacketsocket.cc b/webrtc/rtc_base/asyncpacketsocket.cc
index fe36401..5c9bcbb 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/base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncpacketsocket.h b/webrtc/rtc_base/asyncpacketsocket.h
index 5a6c97e..596812d 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/base/constructormagic.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/timeutils.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"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncresolverinterface.cc b/webrtc/rtc_base/asyncresolverinterface.cc
index 7ee02f1..b6f2c48 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/base/asyncresolverinterface.h"
+#include "webrtc/rtc_base/asyncresolverinterface.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncresolverinterface.h b/webrtc/rtc_base/asyncresolverinterface.h
index 1784019..7b8c533 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/base/sigslot.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncsocket.cc b/webrtc/rtc_base/asyncsocket.cc
index c593c4f..7cb76cc 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/base/asyncsocket.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncsocket.h b/webrtc/rtc_base/asyncsocket.h
index 3aa5d76..7284506 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/base/sigslot.h"
-#include "webrtc/base/socket.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socket.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asynctcpsocket.cc b/webrtc/rtc_base/asynctcpsocket.cc
index 658541c..1da70df 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/base/asynctcpsocket.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
#include <string.h>
#include <algorithm>
#include <memory>
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_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 cf76456..1fee4fe 100644
--- a/webrtc/rtc_base/asynctcpsocket.h
+++ b/webrtc/rtc_base/asynctcpsocket.h
@@ -13,10 +13,10 @@
#include <memory>
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/socketfactory.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/socketfactory.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asynctcpsocket_unittest.cc b/webrtc/rtc_base/asynctcpsocket_unittest.cc
index bd7dcfb..f120db0 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/base/asynctcpsocket.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncudpsocket.cc b/webrtc/rtc_base/asyncudpsocket.cc
index 0bccb73..c5068a6 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/base/asyncudpsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncudpsocket.h b/webrtc/rtc_base/asyncudpsocket.h
index bff70f1..15c1e76 100644
--- a/webrtc/rtc_base/asyncudpsocket.h
+++ b/webrtc/rtc_base/asyncudpsocket.h
@@ -13,8 +13,8 @@
#include <memory>
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/socketfactory.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/socketfactory.h"
namespace rtc {
diff --git a/webrtc/rtc_base/asyncudpsocket_unittest.cc b/webrtc/rtc_base/asyncudpsocket_unittest.cc
index 9922005..c16c59d 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/base/asyncudpsocket.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/physicalsocketserver.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/atomicops_unittest.cc b/webrtc/rtc_base/atomicops_unittest.cc
index 2aa28ca..d5a1105 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/base/criticalsection_unittest.cc.
+// webrtc/rtc_base/criticalsection_unittest.cc.
diff --git a/webrtc/rtc_base/base64.cc b/webrtc/rtc_base/base64.cc
index 43b6325..5fe424d 100644
--- a/webrtc/rtc_base/base64.cc
+++ b/webrtc/rtc_base/base64.cc
@@ -14,11 +14,11 @@
//*
//*********************************************************************
-#include "webrtc/base/base64.h"
+#include "webrtc/rtc_base/base64.h"
#include <string.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
using std::vector;
diff --git a/webrtc/rtc_base/base64_unittest.cc b/webrtc/rtc_base/base64_unittest.cc
index 6bfba79..c418c6f 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/base/base64.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringutils.h"
+#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/testbase64.h"
+#include "webrtc/rtc_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 df5ed5e..550e61d 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/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/bind.h b/webrtc/rtc_base/bind.h
index 975a5e0..0918fbc 100644
--- a/webrtc/rtc_base/bind.h
+++ b/webrtc/rtc_base/bind.h
@@ -64,8 +64,8 @@
#include <tuple>
#include <type_traits>
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/template_util.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/template_util.h"
#define NONAME
diff --git a/webrtc/rtc_base/bind_unittest.cc b/webrtc/rtc_base/bind_unittest.cc
index c97a555..64d6ee4 100644
--- a/webrtc/rtc_base/bind_unittest.cc
+++ b/webrtc/rtc_base/bind_unittest.cc
@@ -10,10 +10,10 @@
#include <type_traits>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/refcount.h"
namespace rtc {
diff --git a/webrtc/rtc_base/bitbuffer.cc b/webrtc/rtc_base/bitbuffer.cc
index 4ea2b15..fec64e6 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/base/bitbuffer.h"
+#include "webrtc/rtc_base/bitbuffer.h"
#include <algorithm>
#include <limits>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace {
diff --git a/webrtc/rtc_base/bitbuffer.h b/webrtc/rtc_base/bitbuffer.h
index bd5e5f8..03e8ff9 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/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/bitbuffer_unittest.cc b/webrtc/rtc_base/bitbuffer_unittest.cc
index 1614299..b9d6155 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/base/arraysize.h"
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/buffer.h b/webrtc/rtc_base/buffer.h
index 171d1ea..25d55e0 100644
--- a/webrtc/rtc_base/buffer.h
+++ b/webrtc/rtc_base/buffer.h
@@ -17,9 +17,9 @@
#include <type_traits>
#include <utility>
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/type_traits.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/type_traits.h"
namespace rtc {
diff --git a/webrtc/rtc_base/buffer_unittest.cc b/webrtc/rtc_base/buffer_unittest.cc
index 82baedb..bd4306e 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/base/buffer.h"
+#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/gunit.h"
#include <type_traits>
#include <utility>
diff --git a/webrtc/rtc_base/bufferqueue.cc b/webrtc/rtc_base/bufferqueue.cc
index 6e5439d..9072043 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/base/bufferqueue.h"
+#include "webrtc/rtc_base/bufferqueue.h"
#include <algorithm>
diff --git a/webrtc/rtc_base/bufferqueue.h b/webrtc/rtc_base/bufferqueue.h
index 7db2c8c..3abb8cf 100644
--- a/webrtc/rtc_base/bufferqueue.h
+++ b/webrtc/rtc_base/bufferqueue.h
@@ -14,9 +14,9 @@
#include <deque>
#include <vector>
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
namespace rtc {
diff --git a/webrtc/rtc_base/bufferqueue_unittest.cc b/webrtc/rtc_base/bufferqueue_unittest.cc
index 07084c4..23d1751 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/base/bufferqueue.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/bufferqueue.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/bytebuffer.cc b/webrtc/rtc_base/bytebuffer.cc
index 859c123..6bee27f 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/base/bytebuffer.h"
+#include "webrtc/rtc_base/bytebuffer.h"
#include <string.h>
#include <algorithm>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/byteorder.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/byteorder.h"
namespace rtc {
diff --git a/webrtc/rtc_base/bytebuffer.h b/webrtc/rtc_base/bytebuffer.h
index b631ae1..36b18d2 100644
--- a/webrtc/rtc_base/bytebuffer.h
+++ b/webrtc/rtc_base/bytebuffer.h
@@ -13,9 +13,9 @@
#include <string>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/bytebuffer_unittest.cc b/webrtc/rtc_base/bytebuffer_unittest.cc
index 597f5f5..afca353 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/base/arraysize.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/byteorder.h b/webrtc/rtc_base/byteorder.h
index d188f31..760ea06 100644
--- a/webrtc/rtc_base/byteorder.h
+++ b/webrtc/rtc_base/byteorder.h
@@ -15,7 +15,7 @@
#include <arpa/inet.h>
#endif
-#include "webrtc/base/basictypes.h"
+#include "webrtc/rtc_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 6d9b44f..aba8e9f 100644
--- a/webrtc/rtc_base/byteorder_unittest.cc
+++ b/webrtc/rtc_base/byteorder_unittest.cc
@@ -10,8 +10,8 @@
#include <stdint.h>
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/callback.h b/webrtc/rtc_base/callback.h
index 4435a18..41077e8 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/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace rtc {
diff --git a/webrtc/rtc_base/callback_unittest.cc b/webrtc/rtc_base/callback_unittest.cc
index aba1e0c..0628686 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/checks.cc b/webrtc/rtc_base/checks.cc
index 32c2f58..533240f 100644
--- a/webrtc/rtc_base/checks.cc
+++ b/webrtc/rtc_base/checks.cc
@@ -30,8 +30,8 @@
#include <windows.h>
#endif
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_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 d2fb115..f9507e2 100644
--- a/webrtc/rtc_base/checks.h
+++ b/webrtc/rtc_base/checks.h
@@ -36,7 +36,7 @@
#include <sstream>
#include <string>
-#include "webrtc/base/safe_compare.h"
+#include "webrtc/rtc_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 e1ba8de..76db6f5 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/base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
namespace rtc {
diff --git a/webrtc/rtc_base/copyonwritebuffer.h b/webrtc/rtc_base/copyonwritebuffer.h
index d0cdafb..a247917 100644
--- a/webrtc/rtc_base/copyonwritebuffer.h
+++ b/webrtc/rtc_base/copyonwritebuffer.h
@@ -14,10 +14,10 @@
#include <algorithm>
#include <utility>
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/copyonwritebuffer_unittest.cc b/webrtc/rtc_base/copyonwritebuffer_unittest.cc
index fefd0c7..2845248 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/base/copyonwritebuffer.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/cpu_time.cc b/webrtc/rtc_base/cpu_time.cc
index 5fce366..41ac4ca 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/base/cpu_time.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/cpu_time.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_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 bfdd7ef..a9af7ba 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 <memory>
+#include "webrtc/rtc_base/cpu_time.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 <memory>
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/timeutils.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 97b8214..3db6b1b 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/base/crc32.h"
+#include "webrtc/rtc_base/crc32.h"
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
namespace rtc {
diff --git a/webrtc/rtc_base/crc32.h b/webrtc/rtc_base/crc32.h
index a7228df..d8b121d 100644
--- a/webrtc/rtc_base/crc32.h
+++ b/webrtc/rtc_base/crc32.h
@@ -13,7 +13,7 @@
#include <string>
-#include "webrtc/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
namespace rtc {
diff --git a/webrtc/rtc_base/crc32_unittest.cc b/webrtc/rtc_base/crc32_unittest.cc
index 6da5c32..49c5600 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/base/crc32.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/gunit.h"
#include <string>
diff --git a/webrtc/rtc_base/criticalsection.cc b/webrtc/rtc_base/criticalsection.cc
index 5a7bc76..08acb13 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/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_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 20a23ce..38172d7 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/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/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/typedefs.h"
#if defined(WEBRTC_WIN)
diff --git a/webrtc/rtc_base/criticalsection_unittest.cc b/webrtc/rtc_base/criticalsection_unittest.cc
index a16f4f2..672a674 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/cryptstring.cc b/webrtc/rtc_base/cryptstring.cc
index 4b2a83f..1df5407 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/base/cryptstring.h"
+#include "webrtc/rtc_base/cryptstring.h"
namespace rtc {
diff --git a/webrtc/rtc_base/event.cc b/webrtc/rtc_base/event.cc
index 27506b3..cddf677 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/base/event.h"
+#include "webrtc/rtc_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/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/event.h b/webrtc/rtc_base/event.h
index ca43d4d..b3c0e7c 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/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h" // NOLINT: consider this a system header.
+#include "webrtc/rtc_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 cb7554a..8a6a7d5 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/base/event_tracer.h"
+#include "webrtc/rtc_base/event_tracer.h"
#include <inttypes.h>
#include <string>
#include <vector>
-#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"
+#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"
// 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/base/trace_event.h.
+// webrtc/rtc_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/base/trace_event.h TraceValueUnion.
+ // Copied from webrtc/rtc_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 a16c0ef..527b4eb 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/base/event_tracer.h"
+#include "webrtc/rtc_base/event_tracer.h"
-#include "webrtc/base/trace_event.h"
+#include "webrtc/rtc_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 996ad2f..02da66f 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/base/event.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/fakeclock.cc b/webrtc/rtc_base/fakeclock.cc
index d95408f..e9c3e9b 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/base/fakeclock.h"
+#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/messagequeue.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/messagequeue.h"
namespace rtc {
diff --git a/webrtc/rtc_base/fakeclock.h b/webrtc/rtc_base/fakeclock.h
index 659ae10..c5bdab1 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/base/criticalsection.h"
-#include "webrtc/base/timedelta.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/timedelta.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/fakenetwork.h b/webrtc/rtc_base/fakenetwork.h
index ef3b5da..479540d 100644
--- a/webrtc/rtc_base/fakenetwork.h
+++ b/webrtc/rtc_base/fakenetwork.h
@@ -16,11 +16,11 @@
#include <utility>
#include <vector>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/fakesslidentity.h b/webrtc/rtc_base/fakesslidentity.h
index cc23b31..ae9eeb1 100644
--- a/webrtc/rtc_base/fakesslidentity.h
+++ b/webrtc/rtc_base/fakesslidentity.h
@@ -15,9 +15,9 @@
#include <memory>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/file.cc b/webrtc/rtc_base/file.cc
index 983eb8b..c4c5e5a 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/base/file.h"
+#include "webrtc/rtc_base/file.h"
#include <utility>
diff --git a/webrtc/rtc_base/file.h b/webrtc/rtc_base/file.h
index 7c82006..50639c4 100644
--- a/webrtc/rtc_base/file.h
+++ b/webrtc/rtc_base/file.h
@@ -15,9 +15,9 @@
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/platform_file.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/rtc_base/platform_file.h"
namespace rtc {
diff --git a/webrtc/rtc_base/file_posix.cc b/webrtc/rtc_base/file_posix.cc
index c386a34..fab6dd3 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/base/file.h"
+#include "webrtc/rtc_base/file.h"
#include <errno.h>
#include <fcntl.h>
@@ -18,7 +18,7 @@
#include <limits>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/file_unittest.cc b/webrtc/rtc_base/file_unittest.cc
index 99a5d58..a052a6e 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/base/gunit.h"
-#include "webrtc/base/file.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/gunit.h"
#include "webrtc/test/testsupport/fileutils.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_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 71e6eff..6cb259a 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/base/file.h"
+#include "webrtc/rtc_base/file.h"
#include <io.h>
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#include <limits> // NOLINT: win32.h should be considered a system header
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/filerotatingstream.cc b/webrtc/rtc_base/filerotatingstream.cc
index d1434de..37cd607 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/base/filerotatingstream.h"
+#include "webrtc/rtc_base/filerotatingstream.h"
#include <algorithm>
#include <iostream>
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/pathutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_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 9a4820a..db8d1ac 100644
--- a/webrtc/rtc_base/filerotatingstream.h
+++ b/webrtc/rtc_base/filerotatingstream.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/stream.h"
namespace rtc {
diff --git a/webrtc/rtc_base/filerotatingstream_unittest.cc b/webrtc/rtc_base/filerotatingstream_unittest.cc
index 9ce00da..b5fcefb 100644
--- a/webrtc/rtc_base/filerotatingstream_unittest.cc
+++ b/webrtc/rtc_base/filerotatingstream_unittest.cc
@@ -10,12 +10,12 @@
#include <memory>
-#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/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/test/testsupport/fileutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/fileutils.cc b/webrtc/rtc_base/fileutils.cc
index 187da14..9a97cda 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/base/fileutils.h"
+#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/stringutils.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"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32filesystem.h"
+#include "webrtc/rtc_base/win32filesystem.h"
#else
-#include "webrtc/base/unixfilesystem.h"
+#include "webrtc/rtc_base/unixfilesystem.h"
#endif
#if !defined(WEBRTC_WIN)
diff --git a/webrtc/rtc_base/fileutils.h b/webrtc/rtc_base/fileutils.h
index 17e8103..b633a38 100644
--- a/webrtc/rtc_base/fileutils.h
+++ b/webrtc/rtc_base/fileutils.h
@@ -21,9 +21,9 @@
#include <unistd.h>
#endif
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/platform_file.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/platform_file.h"
namespace rtc {
diff --git a/webrtc/rtc_base/fileutils_unittest.cc b/webrtc/rtc_base/fileutils_unittest.cc
index c9650e2..80dadf7 100644
--- a/webrtc/rtc_base/fileutils_unittest.cc
+++ b/webrtc/rtc_base/fileutils_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/stream.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"
namespace rtc {
diff --git a/webrtc/rtc_base/firewallsocketserver.cc b/webrtc/rtc_base/firewallsocketserver.cc
index 4a2a404..b60a943 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/base/firewallsocketserver.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
#include <algorithm>
-#include "webrtc/base/asyncsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/firewallsocketserver.h b/webrtc/rtc_base/firewallsocketserver.h
index 5c3abdc..d78a241 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/base/socketserver.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/socketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/flags.cc b/webrtc/rtc_base/flags.cc
index 9b7177c..19d2f82 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/base/flags.h"
+#include "webrtc/rtc_base/flags.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_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 3d4527c..b2d8b76 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/base/checks.h"
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/function_view.h b/webrtc/rtc_base/function_view.h
index 56964a6..a187d55 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/base/checks.h"
+#include "webrtc/rtc_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 c769fe6..00a8714 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/base/function_view.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/function_view.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/gunit.h b/webrtc/rtc_base/gunit.h
index b9b5a69..3260019 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/base/fakeclock.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_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 aa6a6ae..f7b1fa8 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/base/helpers.h"
+#include "webrtc/rtc_base/helpers.h"
#include <limits>
#include <memory>
#include <openssl/rand.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"
+#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"
// Protect against max macro inclusion.
#undef max
diff --git a/webrtc/rtc_base/helpers.h b/webrtc/rtc_base/helpers.h
index 0a4298a..fac2653 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/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
namespace rtc {
diff --git a/webrtc/rtc_base/helpers_unittest.cc b/webrtc/rtc_base/helpers_unittest.cc
index 394e2b0..d5c0cea 100644
--- a/webrtc/rtc_base/helpers_unittest.cc
+++ b/webrtc/rtc_base/helpers_unittest.cc
@@ -10,10 +10,10 @@
#include <string>
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
namespace rtc {
diff --git a/webrtc/rtc_base/httpbase.cc b/webrtc/rtc_base/httpbase.cc
index bc8ac64..64cb5d9 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/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#else // !WEBRTC_WIN
#define SEC_E_CERT_EXPIRED (-2146893016)
#endif // !WEBRTC_WIN
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/httpbase.h b/webrtc/rtc_base/httpbase.h
index d5730ba..5086502 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/base/httpcommon.h"
+#include "webrtc/rtc_base/httpcommon.h"
namespace rtc {
diff --git a/webrtc/rtc_base/httpbase_unittest.cc b/webrtc/rtc_base/httpbase_unittest.cc
index 11fa821..37a6b26 100644
--- a/webrtc/rtc_base/httpbase_unittest.cc
+++ b/webrtc/rtc_base/httpbase_unittest.cc
@@ -10,9 +10,9 @@
#include <algorithm>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/httpbase.h"
-#include "webrtc/base/testutils.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/httpbase.h"
+#include "webrtc/rtc_base/testutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/httpcommon-inl.h b/webrtc/rtc_base/httpcommon-inl.h
index c324831..f0b0242 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/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/httpcommon.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/httpcommon.h"
namespace rtc {
diff --git a/webrtc/rtc_base/httpcommon.cc b/webrtc/rtc_base/httpcommon.cc
index 031505b..a45d922 100644
--- a/webrtc/rtc_base/httpcommon.cc
+++ b/webrtc/rtc_base/httpcommon.cc
@@ -21,16 +21,16 @@
#include <algorithm>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/httpcommon.h b/webrtc/rtc_base/httpcommon.h
index 12d18d5..bb96f98 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/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/httpcommon_unittest.cc b/webrtc/rtc_base/httpcommon_unittest.cc
index 10e3789..2a4fe65 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/base/gunit.h"
-#include "webrtc/base/httpcommon-inl.h"
-#include "webrtc/base/httpcommon.h"
+#include "webrtc/rtc_base/httpcommon.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/httpcommon-inl.h"
namespace rtc {
diff --git a/webrtc/rtc_base/httpserver.cc b/webrtc/rtc_base/httpserver.cc
index b190691..9d7aafd 100644
--- a/webrtc/rtc_base/httpserver.cc
+++ b/webrtc/rtc_base/httpserver.cc
@@ -10,14 +10,14 @@
#include <algorithm>
-#include "webrtc/base/httpcommon-inl.h"
+#include "webrtc/rtc_base/httpcommon-inl.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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/httpserver.h b/webrtc/rtc_base/httpserver.h
index a4acc4b..0db78dd 100644
--- a/webrtc/rtc_base/httpserver.h
+++ b/webrtc/rtc_base/httpserver.h
@@ -14,7 +14,7 @@
#include <map>
#include <memory>
-#include "webrtc/base/httpbase.h"
+#include "webrtc/rtc_base/httpbase.h"
namespace rtc {
diff --git a/webrtc/rtc_base/httpserver_unittest.cc b/webrtc/rtc_base/httpserver_unittest.cc
index 4db4ad7..1e5e0ff 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/base/gunit.h"
-#include "webrtc/base/httpserver.h"
-#include "webrtc/base/testutils.h"
+#include "webrtc/rtc_base/httpserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/testutils.h"
using namespace webrtc::testing;
diff --git a/webrtc/rtc_base/ifaddrs-android.cc b/webrtc/rtc_base/ifaddrs-android.cc
index f3c7838..d225457 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/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 "webrtc/rtc_base/ifaddrs-android.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 7dd3555..b9660e0 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/base/ifaddrs_converter.h"
+#include "webrtc/rtc_base/ifaddrs_converter.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ifaddrs_converter.h b/webrtc/rtc_base/ifaddrs_converter.h
index 0cda8d4..8a1fe69 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/base/ifaddrs-android.h"
+#include "webrtc/rtc_base/ifaddrs-android.h"
#else
#include <ifaddrs.h>
#endif // WEBRTC_ANDROID
-#include "webrtc/base/ipaddress.h"
+#include "webrtc/rtc_base/ipaddress.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ipaddress.cc b/webrtc/rtc_base/ipaddress.cc
index c06a1a7..fa24bef 100644
--- a/webrtc/rtc_base/ipaddress.cc
+++ b/webrtc/rtc_base/ipaddress.cc
@@ -25,13 +25,13 @@
#include <stdio.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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/ipaddress.h b/webrtc/rtc_base/ipaddress.h
index e8a9f29..7ccea2d 100644
--- a/webrtc/rtc_base/ipaddress.h
+++ b/webrtc/rtc_base/ipaddress.h
@@ -25,10 +25,10 @@
#include <string>
#include <vector>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/byteorder.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/byteorder.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/ipaddress_unittest.cc b/webrtc/rtc_base/ipaddress_unittest.cc
index 802b47b..3389fef 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/base/gunit.h"
-#include "webrtc/base/ipaddress.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/json.cc b/webrtc/rtc_base/json.cc
index c692534..9a9968a 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/base/json.h"
+#include "webrtc/rtc_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 fe3cf3b..5b65bc8 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/base/json.h"
+#include "webrtc/rtc_base/json.h"
#include <vector>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_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 e590e4c..79f361c 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/base/bind.h"
-#include "webrtc/base/callback.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.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"
namespace rtc {
diff --git a/webrtc/rtc_base/location.cc b/webrtc/rtc_base/location.cc
index c3dfe77..9b0a5f6 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/base/location.h"
+#include "webrtc/rtc_base/location.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/location.h b/webrtc/rtc_base/location.h
index 6a4c979..dd1b1ca 100644
--- a/webrtc/rtc_base/location.h
+++ b/webrtc/rtc_base/location.h
@@ -13,7 +13,7 @@
#include <string>
-#include "webrtc/base/stringize_macros.h"
+#include "webrtc/rtc_base/stringize_macros.h"
namespace rtc {
diff --git a/webrtc/rtc_base/logging.cc b/webrtc/rtc_base/logging.cc
index 25f85c9..4f46b0a 100644
--- a/webrtc/rtc_base/logging.cc
+++ b/webrtc/rtc_base/logging.cc
@@ -39,12 +39,12 @@
#include <ostream>
#include <vector>
-#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"
+#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"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/logging.h b/webrtc/rtc_base/logging.h
index 455aac0..345e0d3 100644
--- a/webrtc/rtc_base/logging.h
+++ b/webrtc/rtc_base/logging.h
@@ -57,9 +57,9 @@
#include <CoreServices/CoreServices.h>
#endif
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_annotations.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_annotations.h"
namespace rtc {
diff --git a/webrtc/rtc_base/logging_unittest.cc b/webrtc/rtc_base/logging_unittest.cc
index 3d9fc9e..5e7f67c 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/logsinks.cc b/webrtc/rtc_base/logsinks.cc
index 5a6db45..ba0b5a5 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/base/logsinks.h"
+#include "webrtc/rtc_base/logsinks.h"
#include <iostream>
#include <string>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/logsinks.h b/webrtc/rtc_base/logsinks.h
index bfc3703..e54d6ef 100644
--- a/webrtc/rtc_base/logsinks.h
+++ b/webrtc/rtc_base/logsinks.h
@@ -14,9 +14,9 @@
#include <memory>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/filerotatingstream.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/filerotatingstream.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/macifaddrs_converter.cc b/webrtc/rtc_base/macifaddrs_converter.cc
index 2ad070e..44e1087 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/base/checks.h"
-#include "webrtc/base/ifaddrs_converter.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ifaddrs_converter.h"
+#include "webrtc/rtc_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 6e90722..282f782 100644
--- a/webrtc/rtc_base/macutils.cc
+++ b/webrtc/rtc_base/macutils.cc
@@ -14,10 +14,10 @@
#include <sys/utsname.h>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/macutils.h"
-#include "webrtc/base/stringutils.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"
namespace rtc {
diff --git a/webrtc/rtc_base/macutils_unittest.cc b/webrtc/rtc_base/macutils_unittest.cc
index d3e33e4..f5f4b8d 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/base/gunit.h"
-#include "webrtc/base/macutils.h"
+#include "webrtc/rtc_base/macutils.h"
+#include "webrtc/rtc_base/gunit.h"
TEST(MacUtilsTest, GetOsVersionName) {
rtc::MacOSVersionName ver = rtc::GetOSVersionName();
diff --git a/webrtc/rtc_base/mathutils.h b/webrtc/rtc_base/mathutils.h
index 3882c32..e57697c 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/base/checks.h"
+#include "webrtc/rtc_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 fda6ddd..be4cac9 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/base/md5.h"
+#include "webrtc/rtc_base/md5.h"
// TODO: Avoid memcmpy - hash directly from memory.
#include <string.h> // for memcpy().
-#include "webrtc/base/byteorder.h" // for RTC_ARCH_CPU_LITTLE_ENDIAN.
+#include "webrtc/rtc_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 74f6bed..543de7d 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/base/md5digest.h"
+#include "webrtc/rtc_base/md5digest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/md5digest.h b/webrtc/rtc_base/md5digest.h
index be5b7d0..2e7426d 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/base/md5.h"
-#include "webrtc/base/messagedigest.h"
+#include "webrtc/rtc_base/md5.h"
+#include "webrtc/rtc_base/messagedigest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/md5digest_unittest.cc b/webrtc/rtc_base/md5digest_unittest.cc
index 67c62db..f2f5eca 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/base/md5digest.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/md5digest.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/memory_usage.cc b/webrtc/rtc_base/memory_usage.cc
index d37a702..34fb910 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/base/memory_usage.h"
+#include "webrtc/rtc_base/memory_usage.h"
#if defined(WEBRTC_LINUX)
#include <unistd.h>
@@ -22,7 +22,7 @@
#include <psapi.h>
#endif
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/memory_usage_unittest.cc b/webrtc/rtc_base/memory_usage_unittest.cc
index 99857ec..5b6224f 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/base/memory_usage.h"
+#include "webrtc/rtc_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 05c8c4f..a72ae40 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/base/messagedigest.h"
+#include "webrtc/rtc_base/messagedigest.h"
#include <memory>
#include <string.h>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/openssldigest.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/openssldigest.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagedigest_unittest.cc b/webrtc/rtc_base/messagedigest_unittest.cc
index 86cf688..ebc091a 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/base/gunit.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagehandler.cc b/webrtc/rtc_base/messagehandler.cc
index be5bb7f..741049a 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/base/messagehandler.h"
-#include "webrtc/base/messagequeue.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/messagequeue.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagehandler.h b/webrtc/rtc_base/messagehandler.h
index 8cb4457..04e4b10 100644
--- a/webrtc/rtc_base/messagehandler.h
+++ b/webrtc/rtc_base/messagehandler.h
@@ -14,7 +14,7 @@
#include <memory>
#include <utility>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/messagequeue.cc b/webrtc/rtc_base/messagequeue.cc
index fce1906..c22cea7 100644
--- a/webrtc/rtc_base/messagequeue.cc
+++ b/webrtc/rtc_base/messagequeue.cc
@@ -9,13 +9,13 @@
*/
#include <algorithm>
-#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"
+#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"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/messagequeue.h b/webrtc/rtc_base/messagequeue.h
index c8e247d..d4057cd 100644
--- a/webrtc/rtc_base/messagequeue.h
+++ b/webrtc/rtc_base/messagequeue.h
@@ -20,16 +20,16 @@
#include <utility>
#include <vector>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/messagequeue_unittest.cc b/webrtc/rtc_base/messagequeue_unittest.cc
index 9652bb3..78bcfcb 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/base/messagequeue.h"
+#include "webrtc/rtc_base/messagequeue.h"
#include <functional>
-#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"
+#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"
using namespace rtc;
diff --git a/webrtc/rtc_base/mod_ops.h b/webrtc/rtc_base/mod_ops.h
index d51f127..211f2e3 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/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/mod_ops_unittest.cc b/webrtc/rtc_base/mod_ops_unittest.cc
index 58c6a8e..c375305 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/base/mod_ops.h"
+#include "webrtc/rtc_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 b7ec161..7454028 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/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"
+#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"
using namespace rtc;
diff --git a/webrtc/rtc_base/natserver.cc b/webrtc/rtc_base/natserver.cc
index e00bf9f..d3d1e14 100644
--- a/webrtc/rtc_base/natserver.cc
+++ b/webrtc/rtc_base/natserver.cc
@@ -10,11 +10,11 @@
#include <memory>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/natserver.h b/webrtc/rtc_base/natserver.h
index 136cc04..fe901f9 100644
--- a/webrtc/rtc_base/natserver.h
+++ b/webrtc/rtc_base/natserver.h
@@ -14,13 +14,13 @@
#include <map>
#include <set>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/natsocketfactory.cc b/webrtc/rtc_base/natsocketfactory.cc
index 95e6487..ad746d7 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/base/natsocketfactory.h"
+#include "webrtc/rtc_base/natsocketfactory.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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/natsocketfactory.h b/webrtc/rtc_base/natsocketfactory.h
index c2f72a8..9e7cce0 100644
--- a/webrtc/rtc_base/natsocketfactory.h
+++ b/webrtc/rtc_base/natsocketfactory.h
@@ -16,10 +16,10 @@
#include <memory>
#include <set>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/socketserver.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/socketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nattypes.cc b/webrtc/rtc_base/nattypes.cc
index 1e37698..973569b 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/base/nattypes.h"
+#include "webrtc/rtc_base/nattypes.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nethelpers.cc b/webrtc/rtc_base/nethelpers.cc
index 6a411a6..0f56416 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/base/nethelpers.h"
+#include "webrtc/rtc_base/nethelpers.h"
#include <memory>
#if defined(WEBRTC_WIN)
#include <ws2spi.h>
#include <ws2tcpip.h>
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#endif
#if defined(WEBRTC_POSIX) && !defined(__native_client__)
#if defined(WEBRTC_ANDROID)
-#include "webrtc/base/ifaddrs-android.h"
+#include "webrtc/rtc_base/ifaddrs-android.h"
#else
#include <ifaddrs.h>
#endif
#endif // defined(WEBRTC_POSIX) && !defined(__native_client__)
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/nethelpers.h b/webrtc/rtc_base/nethelpers.h
index 99d0602..b5f0c01 100644
--- a/webrtc/rtc_base/nethelpers.h
+++ b/webrtc/rtc_base/nethelpers.h
@@ -21,12 +21,12 @@
#include <list>
#include <memory>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/network.cc b/webrtc/rtc_base/network.cc
index 69dc28c..add4c5d 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/base/network.h"
+#include "webrtc/rtc_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/base/ifaddrs_converter.h"
+#include "webrtc/rtc_base/ifaddrs_converter.h"
#endif
#include <stdio.h>
@@ -34,13 +34,13 @@
#include <algorithm>
#include <memory>
-#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"
+#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"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/network.h b/webrtc/rtc_base/network.h
index 17574f6..6f820bb 100644
--- a/webrtc/rtc_base/network.h
+++ b/webrtc/rtc_base/network.h
@@ -19,10 +19,10 @@
#include <string>
#include <vector>
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/networkmonitor.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/networkmonitor.h"
+#include "webrtc/rtc_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 27dab48..4240e06 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/base/network.h"
+#include "webrtc/rtc_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 <sys/types.h>
#include <net/if.h>
-#include "webrtc/base/ifaddrs_converter.h"
+#include <sys/types.h>
+#include "webrtc/rtc_base/ifaddrs_converter.h"
#endif // defined(WEBRTC_POSIX)
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/logging.h" // For LOG_GLE
+#include "webrtc/rtc_base/logging.h" // For LOG_GLE
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/networkmonitor.cc b/webrtc/rtc_base/networkmonitor.cc
index e11e812..a23cc77 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/base/networkmonitor.h"
+#include "webrtc/rtc_base/networkmonitor.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_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 db976bf..f7cef1b 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/base/logging.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nullsocketserver.cc b/webrtc/rtc_base/nullsocketserver.cc
index 5dfd490..5c65386 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/base/checks.h"
-#include "webrtc/base/nullsocketserver.h"
+#include "webrtc/rtc_base/nullsocketserver.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nullsocketserver.h b/webrtc/rtc_base/nullsocketserver.h
index f506e4c..997a416 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/base/event.h"
-#include "webrtc/base/socketserver.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/socketserver.h"
namespace rtc {
diff --git a/webrtc/rtc_base/nullsocketserver_unittest.cc b/webrtc/rtc_base/nullsocketserver_unittest.cc
index fb059c5..5908d32 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/base/gunit.h"
-#include "webrtc/base/nullsocketserver.h"
+#include "webrtc/rtc_base/nullsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/numerics/exp_filter.cc b/webrtc/rtc_base/numerics/exp_filter.cc
index a4754a6..b3d9610 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/base/numerics/exp_filter.h"
+#include "webrtc/rtc_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 fbe88e0..892db1e 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/base/numerics/exp_filter.h"
+#include "webrtc/rtc_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 66391f0..b514aab 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/base/checks.h"
+#include "webrtc/rtc_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 23e63ec..22d2085 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/base/constructormagic.h"
-#include "webrtc/base/numerics/percentile_filter.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_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 f22a6dc..37afba2 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/base/criticalsection.h"
+#include "webrtc/rtc_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 4ebc139..e4984e2 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/base/gunit.h"
-#include "webrtc/base/onetimeevent.h"
+#include "webrtc/rtc_base/onetimeevent.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/openssladapter.cc b/webrtc/rtc_base/openssladapter.cc
index 9cc5ca9..d0ed07a 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/base/openssladapter.h"
+#include "webrtc/rtc_base/openssladapter.h"
#if defined(WEBRTC_POSIX)
#include <unistd.h>
#endif
// Must be included first before openssl headers.
-#include "webrtc/base/win32.h" // NOLINT
+#include "webrtc/rtc_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/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"
+#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"
#ifndef OPENSSL_IS_BORINGSSL
diff --git a/webrtc/rtc_base/openssladapter.h b/webrtc/rtc_base/openssladapter.h
index 7080b8b..2517145 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/base/buffer.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/ssladapter.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_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 3115074..fa27a46 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/base/openssldigest.h"
+#include "webrtc/rtc_base/openssldigest.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/openssl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/openssl.h"
namespace rtc {
diff --git a/webrtc/rtc_base/openssldigest.h b/webrtc/rtc_base/openssldigest.h
index 05aded4..ab4ca16 100644
--- a/webrtc/rtc_base/openssldigest.h
+++ b/webrtc/rtc_base/openssldigest.h
@@ -13,7 +13,7 @@
#include <openssl/evp.h>
-#include "webrtc/base/messagedigest.h"
+#include "webrtc/rtc_base/messagedigest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/opensslidentity.cc b/webrtc/rtc_base/opensslidentity.cc
index 9495496..a6b6e1c 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/base/opensslidentity.h"
+#include "webrtc/rtc_base/opensslidentity.h"
#include <memory>
// Must be included first before openssl headers.
-#include "webrtc/base/win32.h" // NOLINT
+#include "webrtc/rtc_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/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/openssl.h"
-#include "webrtc/base/openssldigest.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"
namespace rtc {
diff --git a/webrtc/rtc_base/opensslidentity.h b/webrtc/rtc_base/opensslidentity.h
index 3d6c810..ed7c072 100644
--- a/webrtc/rtc_base/opensslidentity.h
+++ b/webrtc/rtc_base/opensslidentity.h
@@ -17,9 +17,9 @@
#include <memory>
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_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 d1c16a1..1c0b578 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/base/opensslstreamadapter.h"
+#include "webrtc/rtc_base/opensslstreamadapter.h"
#include <openssl/bio.h>
#include <openssl/crypto.h>
@@ -24,17 +24,17 @@
#include <memory>
#include <vector>
-#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"
+#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"
namespace {
bool g_use_time_callback_for_testing = false;
diff --git a/webrtc/rtc_base/opensslstreamadapter.h b/webrtc/rtc_base/opensslstreamadapter.h
index 67c8046..32518ce 100644
--- a/webrtc/rtc_base/opensslstreamadapter.h
+++ b/webrtc/rtc_base/opensslstreamadapter.h
@@ -15,9 +15,9 @@
#include <memory>
#include <vector>
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/opensslidentity.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/opensslidentity.h"
+#include "webrtc/rtc_base/sslstreamadapter.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 6bebdd5..4b41a2d 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/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace rtc {
namespace optional_internal {
diff --git a/webrtc/rtc_base/optional.h b/webrtc/rtc_base/optional.h
index ab3abf9..6871f3d 100644
--- a/webrtc/rtc_base/optional.h
+++ b/webrtc/rtc_base/optional.h
@@ -20,9 +20,9 @@
#include <ostream>
#endif // UNIT_TEST
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/sanitizer.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/sanitizer.h"
namespace rtc {
diff --git a/webrtc/rtc_base/optional_unittest.cc b/webrtc/rtc_base/optional_unittest.cc
index 1303552..8f2f7fd 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/base/gunit.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/optional.h"
namespace rtc {
diff --git a/webrtc/rtc_base/optionsfile.cc b/webrtc/rtc_base/optionsfile.cc
index ae37877..e8401fb 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/base/optionsfile.h"
+#include "webrtc/rtc_base/optionsfile.h"
#include <ctype.h>
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/optionsfile_unittest.cc b/webrtc/rtc_base/optionsfile_unittest.cc
index 69bd719..525c317 100644
--- a/webrtc/rtc_base/optionsfile_unittest.cc
+++ b/webrtc/rtc_base/optionsfile_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/pathutils.cc b/webrtc/rtc_base/pathutils.cc
index 3036774..8329f2a 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/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/pathutils.h b/webrtc/rtc_base/pathutils.h
index 20305ca..bce5add 100644
--- a/webrtc/rtc_base/pathutils.h
+++ b/webrtc/rtc_base/pathutils.h
@@ -13,7 +13,7 @@
#include <string>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/pathutils_unittest.cc b/webrtc/rtc_base/pathutils_unittest.cc
index b99bc16..390ae8a 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/base/pathutils.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/rtc_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 655d397..8c6c7dd 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/base/physicalsocketserver.h"
+#include "webrtc/rtc_base/physicalsocketserver.h"
#if defined(_MSC_VER) && _MSC_VER < 1300
#pragma warning(disable:4786)
@@ -43,15 +43,15 @@
#include <algorithm>
#include <map>
-#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"
+#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"
#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 55433bd..680b4dd 100644
--- a/webrtc/rtc_base/physicalsocketserver.h
+++ b/webrtc/rtc_base/physicalsocketserver.h
@@ -20,9 +20,9 @@
#include <set>
#include <vector>
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/socketserver.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/socketserver.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 20e66ce..ee95c23 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/platform_file.cc b/webrtc/rtc_base/platform_file.cc
index a00543c..acbac6f 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/base/platform_file.h"
+#include "webrtc/rtc_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 ccb7bfc..2a5f6ed 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/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/platform_thread.cc b/webrtc/rtc_base/platform_thread.cc
index d3a1a03..f65743e 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/base/platform_thread.h"
+#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.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"
#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 84f2b67..4121c97 100644
--- a/webrtc/rtc_base/platform_thread.h
+++ b/webrtc/rtc_base/platform_thread.h
@@ -13,10 +13,10 @@
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/platform_thread_types.h"
-#include "webrtc/base/thread_checker.h"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/platform_thread_unittest.cc b/webrtc/rtc_base/platform_thread_unittest.cc
index 415b9eb..ae1a1d0 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/base/platform_thread.h"
+#include "webrtc/rtc_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 f7668b5..f4b51ad 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/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"
+#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"
using rtc::Socket;
using rtc::Thread;
diff --git a/webrtc/rtc_base/proxyinfo.cc b/webrtc/rtc_base/proxyinfo.cc
index 76c7708..8603f21 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/base/proxyinfo.h"
+#include "webrtc/rtc_base/proxyinfo.h"
namespace rtc {
diff --git a/webrtc/rtc_base/proxyinfo.h b/webrtc/rtc_base/proxyinfo.h
index 89bb1b7..9b70642 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/base/socketaddress.h"
-#include "webrtc/base/cryptstring.h"
+#include "webrtc/rtc_base/cryptstring.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace rtc {
diff --git a/webrtc/rtc_base/proxyserver.cc b/webrtc/rtc_base/proxyserver.cc
index 713a986..18dceac 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/base/proxyserver.h"
+#include "webrtc/rtc_base/proxyserver.h"
#include <algorithm>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/socketfactory.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/socketfactory.h"
namespace rtc {
diff --git a/webrtc/rtc_base/proxyserver.h b/webrtc/rtc_base/proxyserver.h
index 2fba0fb..218d5b3 100644
--- a/webrtc/rtc_base/proxyserver.h
+++ b/webrtc/rtc_base/proxyserver.h
@@ -13,11 +13,11 @@
#include <list>
#include <memory>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/ptr_util_unittest.cc b/webrtc/rtc_base/ptr_util_unittest.cc
index 22669c5..5948c39 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/base/ptr_util.h"
+#include "webrtc/rtc_base/ptr_util.h"
#include <stddef.h>
#include <string>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/race_checker.cc b/webrtc/rtc_base/race_checker.cc
index 92bdd7b..93d563b 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/base/race_checker.h"
+#include "webrtc/rtc_base/race_checker.h"
namespace rtc {
diff --git a/webrtc/rtc_base/race_checker.h b/webrtc/rtc_base/race_checker.h
index a7c893c..b49db53 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/base/checks.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/thread_annotations.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/thread_annotations.h"
namespace rtc {
diff --git a/webrtc/rtc_base/random.cc b/webrtc/rtc_base/random.cc
index 14a9faf..c0cf7fe 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/base/random.h"
+#include "webrtc/rtc_base/random.h"
#include <math.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/random.h b/webrtc/rtc_base/random.h
index d8d157c..1ee6e74 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/base and make sure that it works the same way across platforms.
+ // webrtc/rtc_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 704e81f..0af2733 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/base/mathutils.h" // unsigned difference
-#include "webrtc/base/random.h"
+#include "webrtc/rtc_base/mathutils.h" // unsigned difference
+#include "webrtc/rtc_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 9215fa0..b2ee2c0 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/base/rate_limiter.h"
+#include "webrtc/rtc_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 e13aad0..b4b9080 100644
--- a/webrtc/rtc_base/rate_limiter.h
+++ b/webrtc/rtc_base/rate_limiter.h
@@ -13,9 +13,9 @@
#include <limits>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/rate_statistics.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_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 6d92567..6478399 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/base/event.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/rate_limiter.h"
-#include "webrtc/base/task_queue.h"
+#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/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 3122dbb..a218540 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/base/rate_statistics.h"
+#include "webrtc/rtc_base/rate_statistics.h"
#include <algorithm>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/rate_statistics.h b/webrtc/rtc_base/rate_statistics.h
index 0a3077b..7c4daea 100644
--- a/webrtc/rtc_base/rate_statistics.h
+++ b/webrtc/rtc_base/rate_statistics.h
@@ -13,7 +13,7 @@
#include <memory>
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_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 06136f5..23d1a3c 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/base/rate_statistics.h"
+#include "webrtc/rtc_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 c4a251d..7bf954f 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/base/ratelimiter.h"
+#include "webrtc/rtc_base/ratelimiter.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratelimiter_unittest.cc b/webrtc/rtc_base/ratelimiter_unittest.cc
index b54a751..3962ea3 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/base/gunit.h"
-#include "webrtc/base/ratelimiter.h"
+#include "webrtc/rtc_base/ratelimiter.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratetracker.cc b/webrtc/rtc_base/ratetracker.cc
index a59ec2f..731de8e 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/base/ratetracker.h"
+#include "webrtc/rtc_base/ratetracker.h"
#include <stddef.h>
#include <algorithm>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratetracker.h b/webrtc/rtc_base/ratetracker.h
index 7cdf4a5..3731600 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/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ratetracker_unittest.cc b/webrtc/rtc_base/ratetracker_unittest.cc
index e2b51c1..27aa3a9 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/base/gunit.h"
-#include "webrtc/base/ratetracker.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/refcount.h b/webrtc/rtc_base/refcount.h
index d67e287..c3744d0 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/base/refcountedobject.h"
+#include "webrtc/rtc_base/refcountedobject.h"
namespace rtc {
diff --git a/webrtc/rtc_base/refcountedobject.h b/webrtc/rtc_base/refcountedobject.h
index 5c9e7f1..bf66af2 100644
--- a/webrtc/rtc_base/refcountedobject.h
+++ b/webrtc/rtc_base/refcountedobject.h
@@ -12,7 +12,7 @@
#include <utility>
-#include "webrtc/base/atomicops.h"
+#include "webrtc/rtc_base/atomicops.h"
namespace rtc {
diff --git a/webrtc/rtc_base/refcountedobject_unittest.cc b/webrtc/rtc_base/refcountedobject_unittest.cc
index f6096be..8b27e71 100644
--- a/webrtc/rtc_base/refcountedobject_unittest.cc
+++ b/webrtc/rtc_base/refcountedobject_unittest.cc
@@ -10,8 +10,8 @@
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/refcount.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rollingaccumulator.h b/webrtc/rtc_base/rollingaccumulator.h
index 40b2611..9008db6 100644
--- a/webrtc/rtc_base/rollingaccumulator.h
+++ b/webrtc/rtc_base/rollingaccumulator.h
@@ -14,8 +14,8 @@
#include <algorithm>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rollingaccumulator_unittest.cc b/webrtc/rtc_base/rollingaccumulator_unittest.cc
index 7e3d8cd..ce4b4df 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/base/gunit.h"
-#include "webrtc/base/rollingaccumulator.h"
+#include "webrtc/rtc_base/rollingaccumulator.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificate.cc b/webrtc/rtc_base/rtccertificate.cc
index 3b3b8c9..f5af47e 100644
--- a/webrtc/rtc_base/rtccertificate.cc
+++ b/webrtc/rtc_base/rtccertificate.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "webrtc/base/rtccertificate.h"
+#include "webrtc/rtc_base/rtccertificate.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificate.h b/webrtc/rtc_base/rtccertificate.h
index e97ca73..141023f 100644
--- a/webrtc/rtc_base/rtccertificate.h
+++ b/webrtc/rtc_base/rtccertificate.h
@@ -15,9 +15,9 @@
#include <memory>
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificate_unittest.cc b/webrtc/rtc_base/rtccertificate_unittest.cc
index b318717..348364d 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificategenerator.cc b/webrtc/rtc_base/rtccertificategenerator.cc
index 461a00c..74e9336 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/base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
#include <algorithm>
#include <memory>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificategenerator.h b/webrtc/rtc_base/rtccertificategenerator.h
index 783ed78..272a5d6 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/rtccertificategenerator_unittest.cc b/webrtc/rtc_base/rtccertificategenerator_unittest.cc
index 8dc3cd2..f09f797 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/base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
#include <memory>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/safe_compare.h b/webrtc/rtc_base/safe_compare.h
index 4eb11c2..e9c622b 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/base/type_traits.h"
+#include "webrtc/rtc_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 1ebb722..2a135a1 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/base/safe_compare.h"
+#include "webrtc/rtc_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 f8d73e7..877f28a 100644
--- a/webrtc/rtc_base/safe_conversions.h
+++ b/webrtc/rtc_base/safe_conversions.h
@@ -15,8 +15,8 @@
#include <limits>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions_impl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions_impl.h"
namespace rtc {
diff --git a/webrtc/rtc_base/safe_minmax.h b/webrtc/rtc_base/safe_minmax.h
index bb60a36..77d75a1 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/base/checks.h"
-#include "webrtc/base/safe_compare.h"
-#include "webrtc/base/type_traits.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_compare.h"
+#include "webrtc/rtc_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 eb0fe80..a75b16d 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/base/safe_minmax.h"
+#include "webrtc/rtc_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 5e127c7..40b07f9 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/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/sequenced_task_checker_impl.h"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/sequenced_task_checker_impl.cc b/webrtc/rtc_base/sequenced_task_checker_impl.cc
index f03e0b6..0d2ae3e 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/base/sequenced_task_checker_impl.h"
+#include "webrtc/rtc_base/sequenced_task_checker_impl.h"
#if defined(WEBRTC_MAC)
#include <dispatch/dispatch.h>
#endif
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_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 8b9ec4c..ac43030 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/base/thread_checker.h"
+#include "webrtc/rtc_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 ae6e09d..55fc474 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/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/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/test/gtest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sha1.cc b/webrtc/rtc_base/sha1.cc
index 5816152..c12ebe0 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/base/sha1.h"
+#include "webrtc/rtc_base/sha1.h"
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/rtc_base/sha1digest.cc b/webrtc/rtc_base/sha1digest.cc
index c090a06..cf4de93 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/base/sha1digest.h"
+#include "webrtc/rtc_base/sha1digest.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sha1digest.h b/webrtc/rtc_base/sha1digest.h
index bcd5514..2f939ce 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/base/messagedigest.h"
-#include "webrtc/base/sha1.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/sha1.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sha1digest_unittest.cc b/webrtc/rtc_base/sha1digest_unittest.cc
index d3c2043..24c30fa 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/base/sha1digest.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/sha1digest.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sigslot.cc b/webrtc/rtc_base/sigslot.cc
index 2fdb214..3f22af1 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/base/sigslot.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace sigslot {
diff --git a/webrtc/rtc_base/sigslot.h b/webrtc/rtc_base/sigslot.h
index 2981b52..ec4232c 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/base/win32.h"
+#include "webrtc/rtc_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 6d21d84..d538b0f 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/base/sigslot.h"
+#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_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 5eeb477..ed6dadc 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/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sigslottester_unittest.cc b/webrtc/rtc_base/sigslottester_unittest.cc
index 00b2577..e0861d7 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/base/sigslottester.h"
+#include "webrtc/rtc_base/sigslottester.h"
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socket.h b/webrtc/rtc_base/socket.h
index 9aed77e..2b2161d 100644
--- a/webrtc/rtc_base/socket.h
+++ b/webrtc/rtc_base/socket.h
@@ -22,12 +22,12 @@
#endif
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#endif
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_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 2342007..35bf2d1 100644
--- a/webrtc/rtc_base/socket_unittest.cc
+++ b/webrtc/rtc_base/socket_unittest.cc
@@ -10,18 +10,18 @@
#include <memory>
-#include "webrtc/base/socket_unittest.h"
+#include "webrtc/rtc_base/socket_unittest.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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/socket_unittest.h b/webrtc/rtc_base/socket_unittest.h
index a92c7fd..c236339 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/base/gunit.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketadapters.cc b/webrtc/rtc_base/socketadapters.cc
index 060029c..8519b89 100644
--- a/webrtc/rtc_base/socketadapters.cc
+++ b/webrtc/rtc_base/socketadapters.cc
@@ -26,13 +26,13 @@
#include <algorithm>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/socketadapters.h b/webrtc/rtc_base/socketadapters.h
index a6c5c4e..34dd19b 100644
--- a/webrtc/rtc_base/socketadapters.h
+++ b/webrtc/rtc_base/socketadapters.h
@@ -14,10 +14,10 @@
#include <map>
#include <string>
-#include "webrtc/base/asyncsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/cryptstring.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/cryptstring.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddress.cc b/webrtc/rtc_base/socketaddress.cc
index d931f72..5b26b9f 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/base/socketaddress.h"
+#include "webrtc/rtc_base/socketaddress.h"
#if defined(WEBRTC_POSIX)
#include <sys/types.h>
@@ -27,13 +27,13 @@
#include <sstream>
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#endif
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddress.h b/webrtc/rtc_base/socketaddress.h
index dd64ae9..617e355 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 <iosfwd>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/ipaddress.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/ipaddress.h"
#undef SetPort
diff --git a/webrtc/rtc_base/socketaddress_unittest.cc b/webrtc/rtc_base/socketaddress_unittest.cc
index 072918e..19fbc50 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/base/gunit.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ipaddress.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddresspair.cc b/webrtc/rtc_base/socketaddresspair.cc
index dfa8b25..2be718f 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/base/socketaddresspair.h"
+#include "webrtc/rtc_base/socketaddresspair.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketaddresspair.h b/webrtc/rtc_base/socketaddresspair.h
index 91137a3..cec84a7 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/base/socketaddress.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketfactory.h b/webrtc/rtc_base/socketfactory.h
index 1280264..749eb17 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/base/socket.h"
-#include "webrtc/base/asyncsocket.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/socket.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketserver.h b/webrtc/rtc_base/socketserver.h
index 6d06f2f..dc99c2b 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/base/socketfactory.h"
+#include "webrtc/rtc_base/socketfactory.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketstream.cc b/webrtc/rtc_base/socketstream.cc
index a218dd8..2c09fcf 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/base/socketstream.h"
+#include "webrtc/rtc_base/socketstream.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/socketstream.h b/webrtc/rtc_base/socketstream.h
index 7991c61..e78c876 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/base/asyncsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/stream.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ssladapter.cc b/webrtc/rtc_base/ssladapter.cc
index 06fce54..07a13b5 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/base/ssladapter.h"
+#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/base/openssladapter.h"
+#include "webrtc/rtc_base/openssladapter.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/rtc_base/ssladapter.h b/webrtc/rtc_base/ssladapter.h
index 7e03c4f..dccb6d1 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/base/asyncsocket.h"
-#include "webrtc/base/sslstreamadapter.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
namespace rtc {
diff --git a/webrtc/rtc_base/ssladapter_unittest.cc b/webrtc/rtc_base/ssladapter_unittest.cc
index 0eaac17..929b14f 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/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"
+#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"
static const int kTimeout = 5000;
diff --git a/webrtc/rtc_base/sslfingerprint.cc b/webrtc/rtc_base/sslfingerprint.cc
index bd15743..adf3851 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/base/sslfingerprint.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
#include <ctype.h>
#include <string>
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslfingerprint.h b/webrtc/rtc_base/sslfingerprint.h
index 4effca6..557ac56 100644
--- a/webrtc/rtc_base/sslfingerprint.h
+++ b/webrtc/rtc_base/sslfingerprint.h
@@ -13,10 +13,10 @@
#include <string>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/sslidentity.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslidentity.cc b/webrtc/rtc_base/sslidentity.cc
index a5dd7b9..38c27ca 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/base/sslidentity.h"
+#include "webrtc/rtc_base/sslidentity.h"
#include <ctime>
#include <string>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/sslidentity.h b/webrtc/rtc_base/sslidentity.h
index f84f725..e6ac527 100644
--- a/webrtc/rtc_base/sslidentity.h
+++ b/webrtc/rtc_base/sslidentity.h
@@ -18,10 +18,10 @@
#include <string>
#include <vector>
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslidentity_unittest.cc b/webrtc/rtc_base/sslidentity_unittest.cc
index 5c881c2..9b90b4c 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/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"
+#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"
using rtc::SSLIdentity;
diff --git a/webrtc/rtc_base/sslstreamadapter.cc b/webrtc/rtc_base/sslstreamadapter.cc
index 0927704..d55b6fe 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/base/sslstreamadapter.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/base/opensslstreamadapter.h"
+#include "webrtc/rtc_base/opensslstreamadapter.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/rtc_base/sslstreamadapter.h b/webrtc/rtc_base/sslstreamadapter.h
index 889b634..7fb0867 100644
--- a/webrtc/rtc_base/sslstreamadapter.h
+++ b/webrtc/rtc_base/sslstreamadapter.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/stream.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/stream.h"
namespace rtc {
diff --git a/webrtc/rtc_base/sslstreamadapter_unittest.cc b/webrtc/rtc_base/sslstreamadapter_unittest.cc
index b5184e6..a2d63e8 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/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"
+#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"
using ::testing::WithParamInterface;
using ::testing::Values;
diff --git a/webrtc/rtc_base/stream.cc b/webrtc/rtc_base/stream.cc
index 67ef104..df2d665 100644
--- a/webrtc/rtc_base/stream.cc
+++ b/webrtc/rtc_base/stream.cc
@@ -18,18 +18,18 @@
#include <algorithm>
#include <string>
-#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"
+#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"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#define fileno _fileno
#endif
diff --git a/webrtc/rtc_base/stream.h b/webrtc/rtc_base/stream.h
index c03867d..601ef66 100644
--- a/webrtc/rtc_base/stream.h
+++ b/webrtc/rtc_base/stream.h
@@ -15,13 +15,13 @@
#include <memory>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/stream_unittest.cc b/webrtc/rtc_base/stream_unittest.cc
index 0fbb6ab..0f8fbf1 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/base/fileutils.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/pathutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/string_to_number.cc b/webrtc/rtc_base/string_to_number.cc
index b8e969d..06107f5 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/base/string_to_number.h"
+#include "webrtc/rtc_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 4dcddf5..c61d1ed 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/base/optional.h"
+#include "webrtc/rtc_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 00ebd4c..2c1aece 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/base/string_to_number.h"
+#include "webrtc/rtc_base/string_to_number.h"
#include <string>
#include <type_traits>
#include <limits>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringencode.cc b/webrtc/rtc_base/stringencode.cc
index c7d206f..93470b6 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/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
#include <stdio.h>
#include <stdlib.h>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringencode.h b/webrtc/rtc_base/stringencode.h
index 668947d..5296a9c 100644
--- a/webrtc/rtc_base/stringencode.h
+++ b/webrtc/rtc_base/stringencode.h
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringencode_unittest.cc b/webrtc/rtc_base/stringencode_unittest.cc
index 60929f3..36071ed 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/base/arraysize.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringize_macros_unittest.cc b/webrtc/rtc_base/stringize_macros_unittest.cc
index d0ba113..bb3a0f6 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/base/stringize_macros.h"
+#include "webrtc/rtc_base/stringize_macros.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/rtc_base/stringutils.cc b/webrtc/rtc_base/stringutils.cc
index eca1362..b47bb16 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/base/checks.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/stringutils_unittest.cc b/webrtc/rtc_base/stringutils_unittest.cc
index 7d5b8e2..7689b83 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/base/gunit.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/gunit.h"
namespace rtc {
diff --git a/webrtc/rtc_base/swap_queue.h b/webrtc/rtc_base/swap_queue.h
index 8c65278..3519686 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/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
namespace webrtc {
diff --git a/webrtc/rtc_base/swap_queue_unittest.cc b/webrtc/rtc_base/swap_queue_unittest.cc
index ff00626..ceda7eb 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/base/swap_queue.h"
+#include "webrtc/rtc_base/swap_queue.h"
#include <vector>
diff --git a/webrtc/rtc_base/task_queue.h b/webrtc/rtc_base/task_queue.h
index 4c43b23..218fce9 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/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
#if defined(WEBRTC_WIN) || defined(WEBRTC_BUILD_LIBEVENT)
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/platform_thread.h"
#endif
#if defined(WEBRTC_BUILD_LIBEVENT)
-#include "webrtc/base/refcountedobject.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcountedobject.h"
+#include "webrtc/rtc_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 296da16..45c5f09 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/base/task_queue.h"
+#include "webrtc/rtc_base/task_queue.h"
#include <string.h>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/task_queue_posix.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_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 1376ea3..b1070da 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/base/task_queue.h"
+#include "webrtc/rtc_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/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/task_queue_posix.h"
-#include "webrtc/base/timeutils.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"
namespace rtc {
using internal::GetQueuePtrTls;
diff --git a/webrtc/rtc_base/task_queue_posix.cc b/webrtc/rtc_base/task_queue_posix.cc
index 3b00ac8..89956f1 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/base/task_queue_posix.h"
+#include "webrtc/rtc_base/task_queue_posix.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/task_queue.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_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 856249d..fbaf6d5 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/base/bind.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/timeutils.h"
+#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"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/task_queue_win.cc b/webrtc/rtc_base/task_queue_win.cc
index a149dd8..128a98f 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/base/task_queue.h"
+#include "webrtc/rtc_base/task_queue.h"
#include <mmsystem.h>
#include <string.h>
@@ -16,11 +16,11 @@
#include <algorithm>
#include <queue>
-#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"
+#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"
namespace rtc {
namespace {
diff --git a/webrtc/rtc_base/testclient.cc b/webrtc/rtc_base/testclient.cc
index b6fd692..a54122c 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/base/testclient.h"
+#include "webrtc/rtc_base/testclient.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.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"
namespace rtc {
diff --git a/webrtc/rtc_base/testclient.h b/webrtc/rtc_base/testclient.h
index b15657b..18fe71a 100644
--- a/webrtc/rtc_base/testclient.h
+++ b/webrtc/rtc_base/testclient.h
@@ -13,10 +13,10 @@
#include <memory>
#include <vector>
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/fakeclock.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/fakeclock.h"
namespace rtc {
diff --git a/webrtc/rtc_base/testclient_unittest.cc b/webrtc/rtc_base/testclient_unittest.cc
index 8392abf..2607dbb 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/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"
+#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"
using namespace rtc;
diff --git a/webrtc/rtc_base/testechoserver.h b/webrtc/rtc_base/testechoserver.h
index 2ec46aa..e115332 100644
--- a/webrtc/rtc_base/testechoserver.h
+++ b/webrtc/rtc_base/testechoserver.h
@@ -13,11 +13,11 @@
#include <list>
#include <memory>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/testutils.h b/webrtc/rtc_base/testutils.h
index e66c072..615f094 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/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"
+#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"
namespace webrtc {
namespace testing {
diff --git a/webrtc/rtc_base/thread.cc b/webrtc/rtc_base/thread.cc
index 9174cd1..56a145c 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/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
#if defined(WEBRTC_WIN)
#include <comdef.h>
@@ -16,13 +16,13 @@
#include <time.h>
#endif
-#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"
+#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"
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/base/thread_darwin.mm.
+// defined in webrtc/rtc_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 b6e98fa..35b28ea 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/base/constructormagic.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/platform_thread_types.h"
+#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"
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_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 69938ef..a8ff014e 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/base/thread_annotations.h"
+#include "webrtc/rtc_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 4ab538f..b6ce017 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/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker_impl.h"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/thread_checker_impl.cc b/webrtc/rtc_base/thread_checker_impl.cc
index 79be606..307d6f8 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/base/thread_checker_impl.h"
+#include "webrtc/rtc_base/thread_checker_impl.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_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 05b1b62..628e9b3 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/base/criticalsection.h"
-#include "webrtc/base/platform_thread_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_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 e995b50..42e1fcc 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/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/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/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 c143120..db7d038 100644
--- a/webrtc/rtc_base/thread_unittest.cc
+++ b/webrtc/rtc_base/thread_unittest.cc
@@ -10,14 +10,14 @@
#include <memory>
-#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"
+#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"
#if defined(WEBRTC_WIN)
#include <comdef.h> // NOLINT
diff --git a/webrtc/rtc_base/timedelta.h b/webrtc/rtc_base/timedelta.h
index 49008ba..ae4bda4 100644
--- a/webrtc/rtc_base/timedelta.h
+++ b/webrtc/rtc_base/timedelta.h
@@ -13,7 +13,7 @@
#include <stdint.h>
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_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 281da8f..fdce141 100644
--- a/webrtc/rtc_base/timestampaligner.cc
+++ b/webrtc/rtc_base/timestampaligner.cc
@@ -10,10 +10,10 @@
#include <limits>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timestampaligner.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timestampaligner.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timestampaligner.h b/webrtc/rtc_base/timestampaligner.h
index 90db4b99..dde877c 100644
--- a/webrtc/rtc_base/timestampaligner.h
+++ b/webrtc/rtc_base/timestampaligner.h
@@ -13,7 +13,7 @@
#include <stdint.h>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timestampaligner_unittest.cc b/webrtc/rtc_base/timestampaligner_unittest.cc
index a4c0e5a..0c838af 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/base/gunit.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/timestampaligner.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/timestampaligner.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timeutils.cc b/webrtc/rtc_base/timeutils.cc
index ee1415f..36f9d3f 100644
--- a/webrtc/rtc_base/timeutils.cc
+++ b/webrtc/rtc_base/timeutils.cc
@@ -26,8 +26,8 @@
#include <sys/timeb.h>
#endif
-#include "webrtc/base/checks.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/timeutils_unittest.cc b/webrtc/rtc_base/timeutils_unittest.cc
index bac26c1..5fd9436 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/trace_event.h b/webrtc/rtc_base/trace_event.h
index fd48eae..98f6afa 100644
--- a/webrtc/rtc_base/trace_event.h
+++ b/webrtc/rtc_base/trace_event.h
@@ -8,7 +8,7 @@
#include <string>
-#include "webrtc/base/event_tracer.h"
+#include "webrtc/rtc_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 1f1a2a0..3243e6d 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/base/transformadapter.h"
+#include "webrtc/rtc_base/transformadapter.h"
#include <string.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/rtc_base/transformadapter.h b/webrtc/rtc_base/transformadapter.h
index 0818899..21e11ed 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/base/stream.h"
+#include "webrtc/rtc_base/stream.h"
namespace rtc {
///////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/rtc_base/unittest_main.cc b/webrtc/rtc_base/unittest_main.cc
index 2f8f52c..b7738c6 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/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/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/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 4901412..345c602 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/base/unixfilesystem.h"
+#include "webrtc/rtc_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/base/macutils.h"
+#include "webrtc/rtc_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/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"
+#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"
#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 eb58a4d..0ed36b4 100644
--- a/webrtc/rtc_base/unixfilesystem.h
+++ b/webrtc/rtc_base/unixfilesystem.h
@@ -13,7 +13,7 @@
#include <sys/types.h>
-#include "webrtc/base/fileutils.h"
+#include "webrtc/rtc_base/fileutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/virtualsocket_unittest.cc b/webrtc/rtc_base/virtualsocket_unittest.cc
index 34ee036..b58bdd8 100644
--- a/webrtc/rtc_base/virtualsocket_unittest.cc
+++ b/webrtc/rtc_base/virtualsocket_unittest.cc
@@ -16,16 +16,16 @@
#include <memory>
-#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"
+#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"
using namespace rtc;
diff --git a/webrtc/rtc_base/virtualsocketserver.cc b/webrtc/rtc_base/virtualsocketserver.cc
index a7e2d30..e47b01b 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/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
#include <errno.h>
#include <math.h>
@@ -18,13 +18,13 @@
#include <memory>
#include <vector>
-#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"
+#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"
namespace rtc {
#if defined(WEBRTC_WIN)
diff --git a/webrtc/rtc_base/virtualsocketserver.h b/webrtc/rtc_base/virtualsocketserver.h
index 4de12c7..a08bc0c 100644
--- a/webrtc/rtc_base/virtualsocketserver.h
+++ b/webrtc/rtc_base/virtualsocketserver.h
@@ -14,12 +14,12 @@
#include <deque>
#include <map>
-#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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/weak_ptr.cc b/webrtc/rtc_base/weak_ptr.cc
index 8a07a87..3693a94 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/base/weak_ptr.h"
+#include "webrtc/rtc_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 62c97d9..0e82612 100644
--- a/webrtc/rtc_base/weak_ptr.h
+++ b/webrtc/rtc_base/weak_ptr.h
@@ -15,9 +15,9 @@
#include <utility>
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_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 a3cd1f8..d6da234 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/base/gunit.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/weak_ptr.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/weak_ptr.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32.cc b/webrtc/rtc_base/win32.cc
index 89970ec..276b74b 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/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#include <winsock2.h>
#include <ws2tcpip.h>
#include <algorithm>
-#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/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"
namespace rtc {
diff --git a/webrtc/rtc_base/win32.h b/webrtc/rtc_base/win32.h
index b4c7646..be1195e 100644
--- a/webrtc/rtc_base/win32.h
+++ b/webrtc/rtc_base/win32.h
@@ -38,8 +38,8 @@
#include <string>
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32_unittest.cc b/webrtc/rtc_base/win32_unittest.cc
index c41ca86..831b4b3 100644
--- a/webrtc/rtc_base/win32_unittest.cc
+++ b/webrtc/rtc_base/win32_unittest.cc
@@ -10,9 +10,9 @@
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_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 5445140..973280e 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/base/win32filesystem.h"
+#include "webrtc/rtc_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/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"
+#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"
// 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 71fe466..0cc9bce 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/base/win32.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/win32.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketinit.cc b/webrtc/rtc_base/win32socketinit.cc
index 02a6c26..1a54c44 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/base/win32socketinit.h"
+#include "webrtc/rtc_base/win32socketinit.h"
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketserver.cc b/webrtc/rtc_base/win32socketserver.cc
index daec986..1405c82 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/base/win32socketserver.h"
+#include "webrtc/rtc_base/win32socketserver.h"
#include <algorithm>
#include <ws2tcpip.h> // NOLINT
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/win32window.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/win32window.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketserver.h b/webrtc/rtc_base/win32socketserver.h
index adb621c..1255a80 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/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"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/win32socketserver_unittest.cc b/webrtc/rtc_base/win32socketserver_unittest.cc
index 7211cd7..9eacff7 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/base/gunit.h"
-#include "webrtc/base/socket_unittest.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/win32socketserver.h"
+#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"
namespace rtc {
diff --git a/webrtc/rtc_base/win32window.cc b/webrtc/rtc_base/win32window.cc
index 0e02eef..e005ba1 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/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/win32window.h"
+#include "webrtc/rtc_base/win32window.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32window.h b/webrtc/rtc_base/win32window.h
index 2243a52..a9fe843 100644
--- a/webrtc/rtc_base/win32window.h
+++ b/webrtc/rtc_base/win32window.h
@@ -13,7 +13,7 @@
#if defined(WEBRTC_WIN)
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
namespace rtc {
diff --git a/webrtc/rtc_base/win32window_unittest.cc b/webrtc/rtc_base/win32window_unittest.cc
index f814752..9bd2d34 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/base/gunit.h"
-#include "webrtc/base/win32window.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/win32window.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
static LRESULT kDummyResult = 0x1234ABCD;
diff --git a/webrtc/rtc_base/window.h b/webrtc/rtc_base/window.h
index 2eed4be..10ed9f7 100644
--- a/webrtc/rtc_base/window.h
+++ b/webrtc/rtc_base/window.h
@@ -13,14 +13,14 @@
#include <stdint.h>
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_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/base so just include it here.
-#include "webrtc/base/win32.h" // Include HWND, HMONITOR.
+// We commonly include win32.h in webrtc/rtc_base so just include it here.
+#include "webrtc/rtc_base/win32.h" // Include HWND, HMONITOR.
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
typedef unsigned int CGWindowID;
typedef unsigned int CGDirectDisplayID;
