commit 76de83ef335610c851a8c34a1a57fc09eaffca92
author Edward Lemur <ehmaldonado@webrtc.org> Thu Jul 06 17:44:34 2017
committer Commit Bot <commit-bot@chromium.org> Thu Jul 06 19:11:40 2017
tree 08586e2aa6923785768e5658eafc5ba4ba2eed4e
parent ab1c7907dc77972086ceab9a9dbf2d0621b11a80

Rename webrtc/base -> webrtc/rtc_base

NOPRESUBMIT=True # cpplint errors that aren't caused by this CL.
NOTRY=True
NOTREECHECKS=True
TBR=kwiberg@webrtc.org, kjellander@webrtc.org

Bug: webrtc:7634
Change-Id: I3cca0fbaa807b563c95979cccd6d1bec32055f36
Reviewed-on: https://chromium-review.googlesource.com/562156
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Original-Commit-Position: refs/heads/master@{#18919}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: c20978e581a3f71d96ef2f6078fbad350922fff8

p2p/base/asyncstuntcpsocket.cc

diff --git a/p2p/base/asyncstuntcpsocket.cc b/p2p/base/asyncstuntcpsocket.cc
index 3369bc8..38dd65b 100644
--- a/p2p/base/asyncstuntcpsocket.cc
+++ b/p2p/base/asyncstuntcpsocket.cc
@@ -13,8 +13,8 @@
 #include <string.h>
 
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 

p2p/base/asyncstuntcpsocket.h

diff --git a/p2p/base/asyncstuntcpsocket.h b/p2p/base/asyncstuntcpsocket.h
index 065b4c2..b578f31 100644
--- a/p2p/base/asyncstuntcpsocket.h
+++ b/p2p/base/asyncstuntcpsocket.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
 #define WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
 
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/socketfactory.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/socketfactory.h"
 
 namespace cricket {
 

p2p/base/asyncstuntcpsocket_unittest.cc

diff --git a/p2p/base/asyncstuntcpsocket_unittest.cc b/p2p/base/asyncstuntcpsocket_unittest.cc
index 61e1411..5dd9661 100644
--- a/p2p/base/asyncstuntcpsocket_unittest.cc
+++ b/p2p/base/asyncstuntcpsocket_unittest.cc
@@ -11,9 +11,9 @@
 #include <memory>
 
 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
-#include "webrtc/base/asyncsocket.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace cricket {
 

p2p/base/basicpacketsocketfactory.cc

diff --git a/p2p/base/basicpacketsocketfactory.cc b/p2p/base/basicpacketsocketfactory.cc
index b78a054..e911f2f 100644
--- a/p2p/base/basicpacketsocketfactory.cc
+++ b/p2p/base/basicpacketsocketfactory.cc
@@ -14,15 +14,15 @@
 
 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/physicalsocketserver.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace rtc {
 

p2p/base/candidate.h

diff --git a/p2p/base/candidate.h b/p2p/base/candidate.h
index 723dbc9..474d7fb 100644
--- a/p2p/base/candidate.h
+++ b/p2p/base/candidate.h
@@ -21,10 +21,10 @@
 #include <string>
 
 #include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace cricket {
 

p2p/base/common.h

diff --git a/p2p/base/common.h b/p2p/base/common.h
index 8a3178c..5dbe491 100644
--- a/p2p/base/common.h
+++ b/p2p/base/common.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_P2P_BASE_COMMON_H_
 #define WEBRTC_P2P_BASE_COMMON_H_
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 // Common log description format for jingle messages
 #define LOG_J(sev, obj) LOG(sev) << "Jingle:" << obj->ToString() << ": "

p2p/base/dtlstransportchannel.cc

diff --git a/p2p/base/dtlstransportchannel.cc b/p2p/base/dtlstransportchannel.cc
index f5d6583..4249ae7 100644
--- a/p2p/base/dtlstransportchannel.cc
+++ b/p2p/base/dtlstransportchannel.cc
@@ -15,13 +15,13 @@
 
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/dtlstransportchannel.h

diff --git a/p2p/base/dtlstransportchannel.h b/p2p/base/dtlstransportchannel.h
index 30a7186..12b94ce 100644
--- a/p2p/base/dtlstransportchannel.h
+++ b/p2p/base/dtlstransportchannel.h
@@ -15,13 +15,13 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/bufferqueue.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stream.h"
 #include "webrtc/p2p/base/dtlstransportinternal.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/bufferqueue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stream.h"
 
 namespace rtc {
 class PacketTransportInternal;

p2p/base/dtlstransportchannel_unittest.cc

diff --git a/p2p/base/dtlstransportchannel_unittest.cc b/p2p/base/dtlstransportchannel_unittest.cc
index 4286d76..225d6f7 100644
--- a/p2p/base/dtlstransportchannel_unittest.cc
+++ b/p2p/base/dtlstransportchannel_unittest.cc
@@ -14,14 +14,14 @@
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.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/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.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/stringutils.h"
 
 #define MAYBE_SKIP_TEST(feature)                              \
   if (!(rtc::SSLStreamAdapter::feature())) {                  \

p2p/base/dtlstransportinternal.h

diff --git a/p2p/base/dtlstransportinternal.h b/p2p/base/dtlstransportinternal.h
index 448dd49..b77ae07 100644
--- a/p2p/base/dtlstransportinternal.h
+++ b/p2p/base/dtlstransportinternal.h
@@ -15,11 +15,11 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace cricket {
 

p2p/base/fakedtlstransport.h

diff --git a/p2p/base/fakedtlstransport.h b/p2p/base/fakedtlstransport.h
index 0384f00..e78c7fc 100644
--- a/p2p/base/fakedtlstransport.h
+++ b/p2p/base/fakedtlstransport.h
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/fakesslidentity.h"
 #include "webrtc/p2p/base/dtlstransportinternal.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
 
 namespace cricket {
 

p2p/base/fakeicetransport.h

diff --git a/p2p/base/fakeicetransport.h b/p2p/base/fakeicetransport.h
index 2b0662f..d9c8485 100644
--- a/p2p/base/fakeicetransport.h
+++ b/p2p/base/fakeicetransport.h
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/copyonwritebuffer.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
 
 namespace cricket {
 

p2p/base/fakepackettransport.h

diff --git a/p2p/base/fakepackettransport.h b/p2p/base/fakepackettransport.h
index 64e0f7d..16af9a4 100644
--- a/p2p/base/fakepackettransport.h
+++ b/p2p/base/fakepackettransport.h
@@ -14,9 +14,9 @@
 #include <string>
 
 #include "webrtc/api/ortc/packettransportinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/copyonwritebuffer.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
 
 namespace rtc {
 

p2p/base/fakeportallocator.h

diff --git a/p2p/base/fakeportallocator.h b/p2p/base/fakeportallocator.h
index a1dbbf8..7bf7f96 100644
--- a/p2p/base/fakeportallocator.h
+++ b/p2p/base/fakeportallocator.h
@@ -15,10 +15,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/nethelpers.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/udpport.h"
+#include "webrtc/rtc_base/nethelpers.h"
 
 namespace rtc {
 class SocketFactory;

p2p/base/faketransportcontroller.h

diff --git a/p2p/base/faketransportcontroller.h b/p2p/base/faketransportcontroller.h
index 9a696bc..0c78475 100644
--- a/p2p/base/faketransportcontroller.h
+++ b/p2p/base/faketransportcontroller.h
@@ -15,12 +15,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/sslfingerprint.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/fakedtlstransport.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
 #include "webrtc/p2p/base/transportcontroller.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/icetransportinternal.h

diff --git a/p2p/base/icetransportinternal.h b/p2p/base/icetransportinternal.h
index e9b40dc..435a081 100644
--- a/p2p/base/icetransportinternal.h
+++ b/p2p/base/icetransportinternal.h
@@ -13,12 +13,12 @@
 
 #include <string>
 
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
 #include "webrtc/p2p/base/transportdescription.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace webrtc {
 class MetricsObserverInterface;

p2p/base/jseptransport.cc

diff --git a/p2p/base/jseptransport.cc b/p2p/base/jseptransport.cc
index 301ae24..a8f4564 100644
--- a/p2p/base/jseptransport.cc
+++ b/p2p/base/jseptransport.cc
@@ -13,14 +13,14 @@
 #include <memory>
 #include <utility>  // for std::pair
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 #include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 

p2p/base/jseptransport.h

diff --git a/p2p/base/jseptransport.h b/p2p/base/jseptransport.h
index 7b81be0..9353cd7 100644
--- a/p2p/base/jseptransport.h
+++ b/p2p/base/jseptransport.h
@@ -16,16 +16,16 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
 
 namespace cricket {
 

p2p/base/jseptransport_unittest.cc

diff --git a/p2p/base/jseptransport_unittest.cc b/p2p/base/jseptransport_unittest.cc
index 23ed4d8..56b61ec 100644
--- a/p2p/base/jseptransport_unittest.cc
+++ b/p2p/base/jseptransport_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/network.h"
 #include "webrtc/p2p/base/fakedtlstransport.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/network.h"
 
 using cricket::JsepTransport;
 using cricket::TransportChannel;

p2p/base/mockicetransport.h

diff --git a/p2p/base/mockicetransport.h b/p2p/base/mockicetransport.h
index 53549ab..92d0373 100644
--- a/p2p/base/mockicetransport.h
+++ b/p2p/base/mockicetransport.h
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/gunit.h"
 #include "webrtc/test/gmock.h"
 
 using testing::_;

p2p/base/p2ptransportchannel.cc

diff --git a/p2p/base/p2ptransportchannel.cc b/p2p/base/p2ptransportchannel.cc
index 8853cca..78b4c93 100644
--- a/p2p/base/p2ptransportchannel.cc
+++ b/p2p/base/p2ptransportchannel.cc
@@ -15,15 +15,15 @@
 #include <set>
 
 #include "webrtc/api/umametrics.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/relayport.h"  // For RELAY_PORT_TYPE.
 #include "webrtc/p2p/base/stunport.h"   // For STUN_PORT_TYPE.
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringencode.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace {

p2p/base/p2ptransportchannel.h

diff --git a/p2p/base/p2ptransportchannel.h b/p2p/base/p2ptransportchannel.h
index a535edd..beca558 100644
--- a/p2p/base/p2ptransportchannel.h
+++ b/p2p/base/p2ptransportchannel.h
@@ -26,14 +26,14 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/portinterface.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 namespace cricket {
 

p2p/base/p2ptransportchannel_unittest.cc

diff --git a/p2p/base/p2ptransportchannel_unittest.cc b/p2p/base/p2ptransportchannel_unittest.cc
index b829a59..7b3fa6a 100644
--- a/p2p/base/p2ptransportchannel_unittest.cc
+++ b/p2p/base/p2ptransportchannel_unittest.cc
@@ -12,22 +12,6 @@
 #include <memory>
 
 #include "webrtc/api/fakemetricsobserver.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/proxyserver.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/fakeportallocator.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
@@ -36,6 +20,22 @@
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/proxyserver.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace {
 

p2p/base/packetlossestimator.cc

diff --git a/p2p/base/packetlossestimator.cc b/p2p/base/packetlossestimator.cc
index 7dcd5b9..7990119 100644
--- a/p2p/base/packetlossestimator.cc
+++ b/p2p/base/packetlossestimator.cc
@@ -12,7 +12,7 @@
 
 #include "webrtc/p2p/base/packetlossestimator.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 

p2p/base/packetlossestimator_unittest.cc

diff --git a/p2p/base/packetlossestimator_unittest.cc b/p2p/base/packetlossestimator_unittest.cc
index 44cfdbf..642dcc2 100644
--- a/p2p/base/packetlossestimator_unittest.cc
+++ b/p2p/base/packetlossestimator_unittest.cc
@@ -10,8 +10,8 @@
 
 #include <utility>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/packetlossestimator.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using cricket::PacketLossEstimator;
 

p2p/base/packetsocketfactory.h

diff --git a/p2p/base/packetsocketfactory.h b/p2p/base/packetsocketfactory.h
index c3b2417..60f0ae0 100644
--- a/p2p/base/packetsocketfactory.h
+++ b/p2p/base/packetsocketfactory.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
 #define WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/proxyinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/proxyinfo.h"
 
 namespace rtc {
 

p2p/base/packettransportinternal.h

diff --git a/p2p/base/packettransportinternal.h b/p2p/base/packettransportinternal.h
index 8e32f72..3dc27d5 100644
--- a/p2p/base/packettransportinternal.h
+++ b/p2p/base/packettransportinternal.h
@@ -16,9 +16,9 @@
 
 // This is included for PacketOptions.
 #include "webrtc/api/ortc/packettransportinterface.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socket.h"
 
 namespace cricket {
 class TransportChannel;

p2p/base/port.cc

diff --git a/p2p/base/port.cc b/p2p/base/port.cc
index 3a3d9ea..a101633 100644
--- a/p2p/base/port.cc
+++ b/p2p/base/port.cc
@@ -13,19 +13,19 @@
 #include <algorithm>
 #include <vector>
 
-#include "webrtc/base/base64.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/safe_minmax.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 namespace {
 

p2p/base/port.h

diff --git a/p2p/base/port.h b/p2p/base/port.h
index fd6d182..5764738 100644
--- a/p2p/base/port.h
+++ b/p2p/base/port.h
@@ -17,15 +17,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/proxyinfo.h"
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/jseptransport.h"
@@ -34,6 +25,15 @@
 #include "webrtc/p2p/base/portinterface.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/p2p/base/stunrequest.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/proxyinfo.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/port_unittest.cc

diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index a95bc2b..eb54760 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -10,20 +10,6 @@
 
 #include <memory>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/relayport.h"
@@ -33,6 +19,20 @@
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/base/turnport.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::AsyncPacketSocket;
 using rtc::Buffer;

p2p/base/portallocator.cc

diff --git a/p2p/base/portallocator.cc b/p2p/base/portallocator.cc
index a587aa8..dd776e7 100644
--- a/p2p/base/portallocator.cc
+++ b/p2p/base/portallocator.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/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 

p2p/base/portallocator.h

diff --git a/p2p/base/portallocator.h b/p2p/base/portallocator.h
index dfbed3d..74b67af 100644
--- a/p2p/base/portallocator.h
+++ b/p2p/base/portallocator.h
@@ -18,10 +18,10 @@
 
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/portinterface.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/proxyinfo.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/proxyinfo.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 class MetricsObserverInterface;

p2p/base/portallocator_unittest.cc

diff --git a/p2p/base/portallocator_unittest.cc b/p2p/base/portallocator_unittest.cc
index 3794214..4845f7c 100644
--- a/p2p/base/portallocator_unittest.cc
+++ b/p2p/base/portallocator_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/fakeportallocator.h"
 #include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 static const char kContentName[] = "test content";
 // Based on ICE_UFRAG_LENGTH

p2p/base/portinterface.h

diff --git a/p2p/base/portinterface.h b/p2p/base/portinterface.h
index 4a6e900..7cb8429 100644
--- a/p2p/base/portinterface.h
+++ b/p2p/base/portinterface.h
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/socketaddress.h"
 #include "webrtc/p2p/base/jseptransport.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace rtc {
 class Network;

p2p/base/pseudotcp.cc

diff --git a/p2p/base/pseudotcp.cc b/p2p/base/pseudotcp.cc
index d93f49e..55935e3 100644
--- a/p2p/base/pseudotcp.cc
+++ b/p2p/base/pseudotcp.cc
@@ -17,16 +17,16 @@
 #include <memory>
 #include <set>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 // The following logging is for detailed (packet-level) analysis only.
 #define _DBG_NONE     0

p2p/base/pseudotcp.h

diff --git a/p2p/base/pseudotcp.h b/p2p/base/pseudotcp.h
index 6d402da..134bc00 100644
--- a/p2p/base/pseudotcp.h
+++ b/p2p/base/pseudotcp.h
@@ -13,8 +13,8 @@
 
 #include <list>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/stream.h"
 
 namespace cricket {
 

p2p/base/pseudotcp_unittest.cc

diff --git a/p2p/base/pseudotcp_unittest.cc b/p2p/base/pseudotcp_unittest.cc
index 8fb5b38..157f456 100644
--- a/p2p/base/pseudotcp_unittest.cc
+++ b/p2p/base/pseudotcp_unittest.cc
@@ -12,12 +12,12 @@
 #include <vector>
 
 #include "webrtc/p2p/base/pseudotcp.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 using cricket::PseudoTcp;
 

p2p/base/relayport.cc

diff --git a/p2p/base/relayport.cc b/p2p/base/relayport.cc
index e353511..efb9670 100644
--- a/p2p/base/relayport.cc
+++ b/p2p/base/relayport.cc
@@ -10,10 +10,10 @@
 #include <algorithm>
 
 #include "webrtc/p2p/base/relayport.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 

p2p/base/relayport_unittest.cc

diff --git a/p2p/base/relayport_unittest.cc b/p2p/base/relayport_unittest.cc
index 6b91baf..e1bed76 100644
--- a/p2p/base/relayport_unittest.cc
+++ b/p2p/base/relayport_unittest.cc
@@ -13,14 +13,14 @@
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/relayport.h"
 #include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 

p2p/base/relayserver.cc

diff --git a/p2p/base/relayserver.cc b/p2p/base/relayserver.cc
index d080d90..3a97d4e 100644
--- a/p2p/base/relayserver.cc
+++ b/p2p/base/relayserver.cc
@@ -16,11 +16,11 @@
 
 #include <algorithm>
 
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
 
 namespace cricket {
 

p2p/base/relayserver.h

diff --git a/p2p/base/relayserver.h b/p2p/base/relayserver.h
index c60e271..579b014 100644
--- a/p2p/base/relayserver.h
+++ b/p2p/base/relayserver.h
@@ -17,10 +17,10 @@
 
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/socketaddresspair.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/socketaddresspair.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace cricket {
 

p2p/base/relayserver_unittest.cc

diff --git a/p2p/base/relayserver_unittest.cc b/p2p/base/relayserver_unittest.cc
index f27f438..7c1b29e 100644
--- a/p2p/base/relayserver_unittest.cc
+++ b/p2p/base/relayserver_unittest.cc
@@ -11,16 +11,16 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/testclient.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/relayserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/testclient.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 using namespace cricket;

p2p/base/sessiondescription.h

diff --git a/p2p/base/sessiondescription.h b/p2p/base/sessiondescription.h
index 5a750ef..df9348d 100644
--- a/p2p/base/sessiondescription.h
+++ b/p2p/base/sessiondescription.h
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace cricket {
 

p2p/base/stun.cc

diff --git a/p2p/base/stun.cc b/p2p/base/stun.cc
index 8217c02..56b4ee1 100644
--- a/p2p/base/stun.cc
+++ b/p2p/base/stun.cc
@@ -14,13 +14,13 @@
 
 #include <memory>
 
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 using rtc::ByteBufferReader;
 using rtc::ByteBufferWriter;

p2p/base/stun.h

diff --git a/p2p/base/stun.h b/p2p/base/stun.h
index 4ea4505..4a44dcb 100644
--- a/p2p/base/stun.h
+++ b/p2p/base/stun.h
@@ -17,9 +17,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace cricket {
 

p2p/base/stun_unittest.cc

diff --git a/p2p/base/stun_unittest.cc b/p2p/base/stun_unittest.cc
index 15d4648..ef387a1 100644
--- a/p2p/base/stun_unittest.cc
+++ b/p2p/base/stun_unittest.cc
@@ -10,14 +10,14 @@
 
 #include <string>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
 #include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace cricket {
 

p2p/base/stunport.cc

diff --git a/p2p/base/stunport.cc b/p2p/base/stunport.cc
index 5801ba7..fa7a63c 100644
--- a/p2p/base/stunport.cc
+++ b/p2p/base/stunport.cc
@@ -13,11 +13,11 @@
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
 
 namespace cricket {
 

p2p/base/stunport.h

diff --git a/p2p/base/stunport.h b/p2p/base/stunport.h
index 1bbe25f..de5127c 100644
--- a/p2p/base/stunport.h
+++ b/p2p/base/stunport.h
@@ -16,7 +16,7 @@
 
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/stunrequest.h"
-#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
 
 // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h.
 namespace rtc {

p2p/base/stunport_unittest.cc

diff --git a/p2p/base/stunport_unittest.cc b/p2p/base/stunport_unittest.cc
index bf44ffc..25f5a74 100644
--- a/p2p/base/stunport_unittest.cc
+++ b/p2p/base/stunport_unittest.cc
@@ -13,11 +13,11 @@
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/stunport.h"
 #include "webrtc/p2p/base/teststunserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using cricket::ServerAddresses;
 using rtc::SocketAddress;

p2p/base/stunrequest.cc

diff --git a/p2p/base/stunrequest.cc b/p2p/base/stunrequest.cc
index d3336fa..cace17f 100644
--- a/p2p/base/stunrequest.cc
+++ b/p2p/base/stunrequest.cc
@@ -13,11 +13,11 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace cricket {
 

p2p/base/stunrequest.h

diff --git a/p2p/base/stunrequest.h b/p2p/base/stunrequest.h
index 99dff14..a1c6930 100644
--- a/p2p/base/stunrequest.h
+++ b/p2p/base/stunrequest.h
@@ -14,8 +14,8 @@
 #include <map>
 #include <string>
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/stunrequest_unittest.cc

diff --git a/p2p/base/stunrequest_unittest.cc b/p2p/base/stunrequest_unittest.cc
index 9b8ccac..a4f603b 100644
--- a/p2p/base/stunrequest_unittest.cc
+++ b/p2p/base/stunrequest_unittest.cc
@@ -9,12 +9,12 @@
  */
 
 #include "webrtc/p2p/base/stunrequest.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 using namespace cricket;
 

p2p/base/stunserver.cc

diff --git a/p2p/base/stunserver.cc b/p2p/base/stunserver.cc
index 532add7..3a3a0ab 100644
--- a/p2p/base/stunserver.cc
+++ b/p2p/base/stunserver.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/p2p/base/stunserver.h"
 
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 

p2p/base/stunserver.h

diff --git a/p2p/base/stunserver.h b/p2p/base/stunserver.h
index c9ae86a..92707b0 100644
--- a/p2p/base/stunserver.h
+++ b/p2p/base/stunserver.h
@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
 
 namespace cricket {
 

p2p/base/stunserver_unittest.cc

diff --git a/p2p/base/stunserver_unittest.cc b/p2p/base/stunserver_unittest.cc
index 1e8f8b4..66cb59f 100644
--- a/p2p/base/stunserver_unittest.cc
+++ b/p2p/base/stunserver_unittest.cc
@@ -11,13 +11,13 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/testclient.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/stunserver.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/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using namespace cricket;
 

p2p/base/tcpport.cc

diff --git a/p2p/base/tcpport.cc b/p2p/base/tcpport.cc
index 4fd527e..86670cd 100644
--- a/p2p/base/tcpport.cc
+++ b/p2p/base/tcpport.cc
@@ -67,8 +67,8 @@
 #include "webrtc/p2p/base/tcpport.h"
 
 #include "webrtc/p2p/base/common.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 

p2p/base/tcpport.h

diff --git a/p2p/base/tcpport.h b/p2p/base/tcpport.h
index ce91e44..0974fa7 100644
--- a/p2p/base/tcpport.h
+++ b/p2p/base/tcpport.h
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "webrtc/p2p/base/port.h"
-#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
 
 namespace cricket {
 

p2p/base/tcpport_unittest.cc

diff --git a/p2p/base/tcpport_unittest.cc b/p2p/base/tcpport_unittest.cc
index cc3f9ad..0f7bd1f 100644
--- a/p2p/base/tcpport_unittest.cc
+++ b/p2p/base/tcpport_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/tcpport.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 using cricket::Connection;

p2p/base/testrelayserver.h

diff --git a/p2p/base/testrelayserver.h b/p2p/base/testrelayserver.h
index 7bc0bee..27bc4c1 100644
--- a/p2p/base/testrelayserver.h
+++ b/p2p/base/testrelayserver.h
@@ -14,10 +14,10 @@
 #include <memory>
 
 #include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/teststunserver.h

diff --git a/p2p/base/teststunserver.h b/p2p/base/teststunserver.h
index 1911a0b..1a9e670 100644
--- a/p2p/base/teststunserver.h
+++ b/p2p/base/teststunserver.h
@@ -12,8 +12,8 @@
 #define WEBRTC_P2P_BASE_TESTSTUNSERVER_H_
 
 #include "webrtc/p2p/base/stunserver.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/testturnserver.h

diff --git a/p2p/base/testturnserver.h b/p2p/base/testturnserver.h
index 9cd8203..5091e8e 100644
--- a/p2p/base/testturnserver.h
+++ b/p2p/base/testturnserver.h
@@ -17,8 +17,8 @@
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/p2p/base/turnserver.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/transportchannelimpl.h

diff --git a/p2p/base/transportchannelimpl.h b/p2p/base/transportchannelimpl.h
index f72cb2d..cf6e362 100644
--- a/p2p/base/transportchannelimpl.h
+++ b/p2p/base/transportchannelimpl.h
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/transportchannel.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 class MetricsObserverInterface;

p2p/base/transportcontroller.cc

diff --git a/p2p/base/transportcontroller.cc b/p2p/base/transportcontroller.cc
index db2d8d9..8f6674e 100644
--- a/p2p/base/transportcontroller.cc
+++ b/p2p/base/transportcontroller.cc
@@ -13,10 +13,10 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace {
 

p2p/base/transportcontroller.h

diff --git a/p2p/base/transportcontroller.h b/p2p/base/transportcontroller.h
index 7cc59e8..f16e893 100644
--- a/p2p/base/transportcontroller.h
+++ b/p2p/base/transportcontroller.h
@@ -16,15 +16,15 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/refcountedobject.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/refcountedobject.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
 
 namespace rtc {
 class Thread;

p2p/base/transportcontroller_unittest.cc

diff --git a/p2p/base/transportcontroller_unittest.cc b/p2p/base/transportcontroller_unittest.cc
index 239bb2a..8a2d298 100644
--- a/p2p/base/transportcontroller_unittest.cc
+++ b/p2p/base/transportcontroller_unittest.cc
@@ -11,17 +11,17 @@
 #include <map>
 #include <memory>
 
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/fakeportallocator.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/transportcontroller.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/thread.h"
 
 static const int kTimeout = 100;
 static const char kIceUfrag1[] = "TESTICEUFRAG0001";

p2p/base/transportdescription.cc

diff --git a/p2p/base/transportdescription.cc b/p2p/base/transportdescription.cc
index 4d61edd..7c0f1f5 100644
--- a/p2p/base/transportdescription.cc
+++ b/p2p/base/transportdescription.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/p2p/base/transportdescription.h"
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/p2p/base/p2pconstants.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 namespace cricket {
 

p2p/base/transportdescription.h

diff --git a/p2p/base/transportdescription.h b/p2p/base/transportdescription.h
index 22d054d..6702131 100644
--- a/p2p/base/transportdescription.h
+++ b/p2p/base/transportdescription.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/base/sslfingerprint.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
 
 namespace cricket {
 

p2p/base/transportdescriptionfactory.cc

diff --git a/p2p/base/transportdescriptionfactory.cc b/p2p/base/transportdescriptionfactory.cc
index 856ad46..1c75b32 100644
--- a/p2p/base/transportdescriptionfactory.cc
+++ b/p2p/base/transportdescriptionfactory.cc
@@ -13,10 +13,10 @@
 #include <memory>
 
 #include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/sslfingerprint.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
 
 namespace cricket {
 

p2p/base/transportdescriptionfactory.h

diff --git a/p2p/base/transportdescriptionfactory.h b/p2p/base/transportdescriptionfactory.h
index ac04f04..b9b3c5b 100644
--- a/p2p/base/transportdescriptionfactory.h
+++ b/p2p/base/transportdescriptionfactory.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
 #define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
 
-#include "webrtc/base/rtccertificate.h"
 #include "webrtc/p2p/base/transportdescription.h"
+#include "webrtc/rtc_base/rtccertificate.h"
 
 namespace rtc {
 class SSLIdentity;

p2p/base/transportdescriptionfactory_unittest.cc

diff --git a/p2p/base/transportdescriptionfactory_unittest.cc b/p2p/base/transportdescriptionfactory_unittest.cc
index 83bc072..f8f48bc 100644
--- a/p2p/base/transportdescriptionfactory_unittest.cc
+++ b/p2p/base/transportdescriptionfactory_unittest.cc
@@ -15,9 +15,9 @@
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/p2p/base/transportdescriptionfactory.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ssladapter.h"
 
 using cricket::TransportDescriptionFactory;
 using cricket::TransportDescription;

p2p/base/transportinfo.h

diff --git a/p2p/base/transportinfo.h b/p2p/base/transportinfo.h
index 504eb23..c38bf2a 100644
--- a/p2p/base/transportinfo.h
+++ b/p2p/base/transportinfo.h
@@ -17,7 +17,7 @@
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/base/helpers.h"
+#include "webrtc/rtc_base/helpers.h"
 
 namespace cricket {
 

p2p/base/turnport.cc

diff --git a/p2p/base/turnport.cc b/p2p/base/turnport.cc
index e3caeb5..94f54dc 100644
--- a/p2p/base/turnport.cc
+++ b/p2p/base/turnport.cc
@@ -12,16 +12,16 @@
 
 #include <functional>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/asyncpacketsocket.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"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace cricket {
 

p2p/base/turnport.h

diff --git a/p2p/base/turnport.h b/p2p/base/turnport.h
index e5f384f..4e4d4b1 100644
--- a/p2p/base/turnport.h
+++ b/p2p/base/turnport.h
@@ -16,10 +16,10 @@
 #include <set>
 #include <string>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
 
 namespace rtc {
 class AsyncResolver;

p2p/base/turnport_unittest.cc

diff --git a/p2p/base/turnport_unittest.cc b/p2p/base/turnport_unittest.cc
index 35f0afb..73426cc 100644
--- a/p2p/base/turnport_unittest.cc
+++ b/p2p/base/turnport_unittest.cc
@@ -20,20 +20,20 @@
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/base/turnport.h"
 #include "webrtc/p2p/base/udpport.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 

p2p/base/turnserver.cc

diff --git a/p2p/base/turnserver.cc b/p2p/base/turnserver.cc
index 368bea1..afc5f1d 100644
--- a/p2p/base/turnserver.cc
+++ b/p2p/base/turnserver.cc
@@ -12,20 +12,20 @@
 
 #include <tuple>  // for std::tie
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/packetsocketfactory.h"
 #include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/base/turnserver.h

diff --git a/p2p/base/turnserver.h b/p2p/base/turnserver.h
index 608e043..0a59f27 100644
--- a/p2p/base/turnserver.h
+++ b/p2p/base/turnserver.h
@@ -19,11 +19,11 @@
 #include <vector>
 
 #include "webrtc/p2p/base/portinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace rtc {
 class ByteBufferWriter;

p2p/base/turnserver_unittest.cc

diff --git a/p2p/base/turnserver_unittest.cc b/p2p/base/turnserver_unittest.cc
index 970da47..cac0a5c 100644
--- a/p2p/base/turnserver_unittest.cc
+++ b/p2p/base/turnserver_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
-#include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/turnserver.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 // NOTE: This is a work in progress. Currently this file only has tests for
 // TurnServerConnection, a primitive class used by TurnServer.

p2p/base/udptransport.cc

diff --git a/p2p/base/udptransport.cc b/p2p/base/udptransport.cc
index 976d5bb..3df47ad 100644
--- a/p2p/base/udptransport.cc
+++ b/p2p/base/udptransport.cc
@@ -13,12 +13,12 @@
 #include <string>
 #include <utility>  // For std::move.
 
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace cricket {
 

p2p/base/udptransport.h

diff --git a/p2p/base/udptransport.h b/p2p/base/udptransport.h
index 1cf8e42..c3c9513 100644
--- a/p2p/base/udptransport.h
+++ b/p2p/base/udptransport.h
@@ -15,10 +15,10 @@
 #include <string>
 
 #include "webrtc/api/ortc/udptransportinterface.h"
-#include "webrtc/base/asyncpacketsocket.h"  // For PacketOptions.
-#include "webrtc/base/optional.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"  // For PacketOptions.
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace rtc {
 class AsyncPacketSocket;

p2p/base/udptransport_unittest.cc

diff --git a/p2p/base/udptransport_unittest.cc b/p2p/base/udptransport_unittest.cc
index f9db024..27455e4 100644
--- a/p2p/base/udptransport_unittest.cc
+++ b/p2p/base/udptransport_unittest.cc
@@ -14,16 +14,16 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/socketserver.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
 #include "webrtc/p2p/base/udptransport.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace cricket {
 

p2p/client/basicportallocator.cc

diff --git a/p2p/client/basicportallocator.cc b/p2p/client/basicportallocator.cc
index 2e5bc0d..5ddc475 100644
--- a/p2p/client/basicportallocator.cc
+++ b/p2p/client/basicportallocator.cc
@@ -23,9 +23,9 @@
 #include "webrtc/p2p/base/tcpport.h"
 #include "webrtc/p2p/base/turnport.h"
 #include "webrtc/p2p/base/udpport.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
 
 using rtc::CreateRandomId;
 

p2p/client/basicportallocator.h

diff --git a/p2p/client/basicportallocator.h b/p2p/client/basicportallocator.h
index cd178f9..7cdf0ba 100644
--- a/p2p/client/basicportallocator.h
+++ b/p2p/client/basicportallocator.h
@@ -16,10 +16,10 @@
 #include <vector>
 
 #include "webrtc/p2p/base/portallocator.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/client/basicportallocator_unittest.cc

diff --git a/p2p/client/basicportallocator_unittest.cc b/p2p/client/basicportallocator_unittest.cc
index bf288c9..99e53cf 100644
--- a/p2p/client/basicportallocator_unittest.cc
+++ b/p2p/client/basicportallocator_unittest.cc
@@ -11,21 +11,6 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ipaddress.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/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
@@ -33,6 +18,21 @@
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ipaddress.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/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::IPAddress;
 using rtc::SocketAddress;

p2p/client/socketmonitor.cc

diff --git a/p2p/client/socketmonitor.cc b/p2p/client/socketmonitor.cc
index 098a05d..4e26e42 100644
--- a/p2p/client/socketmonitor.cc
+++ b/p2p/client/socketmonitor.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/p2p/client/socketmonitor.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 

p2p/client/socketmonitor.h

diff --git a/p2p/client/socketmonitor.h b/p2p/client/socketmonitor.h
index b13be74..4cb1899 100644
--- a/p2p/client/socketmonitor.h
+++ b/p2p/client/socketmonitor.h
@@ -13,10 +13,10 @@
 
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/jseptransport.h"  // for ConnectionInfos
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 // TODO(pthatcher): Move these to connectionmonitor.h and
 // connectionmonitor.cc, or just move them into channel.cc

p2p/quic/quicconnectionhelper.h

diff --git a/p2p/quic/quicconnectionhelper.h b/p2p/quic/quicconnectionhelper.h
index 3588ad4..07894f0 100644
--- a/p2p/quic/quicconnectionhelper.h
+++ b/p2p/quic/quicconnectionhelper.h
@@ -16,7 +16,7 @@
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_simple_buffer_allocator.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 

p2p/quic/quicconnectionhelper_unittest.cc

diff --git a/p2p/quic/quicconnectionhelper_unittest.cc b/p2p/quic/quicconnectionhelper_unittest.cc
index 5f16b52..910caca 100644
--- a/p2p/quic/quicconnectionhelper_unittest.cc
+++ b/p2p/quic/quicconnectionhelper_unittest.cc
@@ -13,7 +13,7 @@
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
 
 #include "net/quic/quic_time.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using cricket::QuicAlarm;
 using cricket::QuicConnectionHelper;

p2p/quic/quicsession.cc

diff --git a/p2p/quic/quicsession.cc b/p2p/quic/quicsession.cc
index 65ed135..c7860ef 100644
--- a/p2p/quic/quicsession.cc
+++ b/p2p/quic/quicsession.cc
@@ -13,10 +13,10 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/messagequeue.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/messagequeue.h"
 
 namespace cricket {
 

p2p/quic/quicsession.h

diff --git a/p2p/quic/quicsession.h b/p2p/quic/quicsession.h
index f8b27e0..99195a8 100644
--- a/p2p/quic/quicsession.h
+++ b/p2p/quic/quicsession.h
@@ -18,10 +18,10 @@
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/quic_session.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslidentity.h"
 #include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslidentity.h"
 
 namespace cricket {
 

p2p/quic/quicsession_unittest.cc

diff --git a/p2p/quic/quicsession_unittest.cc b/p2p/quic/quicsession_unittest.cc
index 549e018..1e906fe 100644
--- a/p2p/quic/quicsession_unittest.cc
+++ b/p2p/quic/quicsession_unittest.cc
@@ -16,17 +16,17 @@
 
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/crypto_server_config_protobuf.h"
-#include "net/quic/crypto/quic_random.h"
 #include "net/quic/crypto/proof_source.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/crypto/quic_crypto_client_config.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
+#include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_crypto_server_stream.h"
-#include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
 #include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using net::IPAddress;
 using net::IPEndPoint;

p2p/quic/quictransport.cc

diff --git a/p2p/quic/quictransport.cc b/p2p/quic/quictransport.cc
index aaa11eb..8240f58 100644
--- a/p2p/quic/quictransport.cc
+++ b/p2p/quic/quictransport.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/p2p/quic/quictransport.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 

p2p/quic/quictransport_unittest.cc

diff --git a/p2p/quic/quictransport_unittest.cc b/p2p/quic/quictransport_unittest.cc
index 1fd48f7..3328556 100644
--- a/p2p/quic/quictransport_unittest.cc
+++ b/p2p/quic/quictransport_unittest.cc
@@ -14,9 +14,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/sslidentity.h"
 
 using cricket::TransportChannelImpl;
 using cricket::QuicTransport;

p2p/quic/quictransportchannel.cc

diff --git a/p2p/quic/quictransportchannel.cc b/p2p/quic/quictransportchannel.cc
index 7241f1a..f875ab6 100644
--- a/p2p/quic/quictransportchannel.cc
+++ b/p2p/quic/quictransportchannel.cc
@@ -21,12 +21,12 @@
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_packet_writer.h"
 #include "net/quic/quic_protocol.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/common.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace {
 

p2p/quic/quictransportchannel.h

diff --git a/p2p/quic/quictransportchannel.h b/p2p/quic/quictransportchannel.h
index 0e5af88..4c34675 100644
--- a/p2p/quic/quictransportchannel.h
+++ b/p2p/quic/quictransportchannel.h
@@ -17,11 +17,11 @@
 
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_packet_writer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
 #include "webrtc/p2p/quic/quicsession.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace cricket {
 

p2p/quic/quictransportchannel_unittest.cc

diff --git a/p2p/quic/quictransportchannel_unittest.cc b/p2p/quic/quictransportchannel_unittest.cc
index 7337da9..9ed21f1 100644
--- a/p2p/quic/quictransportchannel_unittest.cc
+++ b/p2p/quic/quictransportchannel_unittest.cc
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sslidentity.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sslidentity.h"
 
 using cricket::ConnectionRole;
 using cricket::IceRole;

p2p/quic/reliablequicstream.cc

diff --git a/p2p/quic/reliablequicstream.cc b/p2p/quic/reliablequicstream.cc
index 5b65f1e..23c2df2 100644
--- a/p2p/quic/reliablequicstream.cc
+++ b/p2p/quic/reliablequicstream.cc
@@ -13,7 +13,7 @@
 #include <string>
 
 #include "net/quic/quic_session.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 

p2p/quic/reliablequicstream.h

diff --git a/p2p/quic/reliablequicstream.h b/p2p/quic/reliablequicstream.h
index 9493a3f..a2d0b57 100644
--- a/p2p/quic/reliablequicstream.h
+++ b/p2p/quic/reliablequicstream.h
@@ -12,9 +12,9 @@
 #define WEBRTC_P2P_QUIC_RELIABLEQUICSTREAM_H_
 
 #include "net/quic/reliable_quic_stream.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/stream.h"
 
 namespace cricket {
 

p2p/quic/reliablequicstream_unittest.cc

diff --git a/p2p/quic/reliablequicstream_unittest.cc b/p2p/quic/reliablequicstream_unittest.cc
index ff517af..4357bcd 100644
--- a/p2p/quic/reliablequicstream_unittest.cc
+++ b/p2p/quic/reliablequicstream_unittest.cc
@@ -17,11 +17,11 @@
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/stream.h"
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/stream.h"
 
 using cricket::QuicConnectionHelper;
 using cricket::ReliableQuicStream;

p2p/stunprober/stunprober.cc

diff --git a/p2p/stunprober/stunprober.cc b/p2p/stunprober/stunprober.cc
index 2ec7732..54c8b1c 100644
--- a/p2p/stunprober/stunprober.cc
+++ b/p2p/stunprober/stunprober.cc
@@ -13,18 +13,18 @@
 #include <set>
 #include <string>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/asyncresolverinterface.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/packetsocketfactory.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncresolverinterface.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace stunprober {
 

p2p/stunprober/stunprober.h

diff --git a/p2p/stunprober/stunprober.h b/p2p/stunprober/stunprober.h
index c7cc33c..b32c8b2 100644
--- a/p2p/stunprober/stunprober.h
+++ b/p2p/stunprober/stunprober.h
@@ -15,16 +15,16 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/callback.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/callback.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/typedefs.h"
 
 namespace rtc {

p2p/stunprober/stunprober_unittest.cc

diff --git a/p2p/stunprober/stunprober_unittest.cc b/p2p/stunprober/stunprober_unittest.cc
index 519831b..2252e61 100644
--- a/p2p/stunprober/stunprober_unittest.cc
+++ b/p2p/stunprober/stunprober_unittest.cc
@@ -12,15 +12,15 @@
 
 #include <memory>
 
-#include "webrtc/base/asyncresolverinterface.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/asyncresolverinterface.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using stunprober::StunProber;
 using stunprober::AsyncCallback;