zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

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

Review-Url: https://codereview.webrtc.org/2962303003 .
Cr-Commit-Position: refs/heads/master@{#18857}
This commit is contained in:
Henrik Kjellander
2017-06-30 15:14:45 +02:00
parent f1c5ebf829
commit 0072511073
313 changed files with 1076 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/rtc_base/array_view.h
View File

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

8
webrtc/rtc_base/array_view_unittest.cc
View File

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

14
webrtc/rtc_base/asyncinvoker-inl.h
View File

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

8
webrtc/rtc_base/asyncinvoker.cc
View File

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

12
webrtc/rtc_base/asyncinvoker.h
View File

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

2
webrtc/rtc_base/asyncpacketsocket.cc
View File

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

10
webrtc/rtc_base/asyncpacketsocket.h
View File

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

2
webrtc/rtc_base/asyncresolverinterface.cc
View File

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

4
webrtc/rtc_base/asyncresolverinterface.h
View File

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

4
webrtc/rtc_base/asyncsocket.cc
View File

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

4
webrtc/rtc_base/asyncsocket.h
View File

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

8
webrtc/rtc_base/asynctcpsocket.cc
View File

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

8
webrtc/rtc_base/asynctcpsocket.h
View File

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

6
webrtc/rtc_base/asynctcpsocket_unittest.cc
View File

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

6
webrtc/rtc_base/asyncudpsocket.cc
View File

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

4
webrtc/rtc_base/asyncudpsocket.h
View File

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

8
webrtc/rtc_base/asyncudpsocket_unittest.cc
View File

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

2
webrtc/rtc_base/atomicops_unittest.cc
View File

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

4
webrtc/rtc_base/base64.cc
View File

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

10
webrtc/rtc_base/base64_unittest.cc
View File

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

4
webrtc/rtc_base/basictypes_unittest.cc
View File

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

4
webrtc/rtc_base/bind.h
View File

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

6
webrtc/rtc_base/bind_unittest.cc
View File

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

4
webrtc/rtc_base/bitbuffer.cc
View File

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

2
webrtc/rtc_base/bitbuffer.h
View File

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

8
webrtc/rtc_base/bitbuffer_unittest.cc
View File

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

6
webrtc/rtc_base/buffer.h
View File

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

6
webrtc/rtc_base/buffer_unittest.cc
View File

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

2
webrtc/rtc_base/bufferqueue.cc
View File

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

6
webrtc/rtc_base/bufferqueue.h
View File

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

4
webrtc/rtc_base/bufferqueue_unittest.cc
View File

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

6
webrtc/rtc_base/bytebuffer.cc
View File

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

6
webrtc/rtc_base/bytebuffer.h
View File

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

8
webrtc/rtc_base/bytebuffer_unittest.cc
View File

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

2
webrtc/rtc_base/byteorder.h
View File

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

4
webrtc/rtc_base/byteorder_unittest.cc
View File

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

4
webrtc/rtc_base/callback.h
View File

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

10
webrtc/rtc_base/callback_unittest.cc
View File

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

4
webrtc/rtc_base/checks.cc
View File

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

2
webrtc/rtc_base/checks.h
View File

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

2
webrtc/rtc_base/copyonwritebuffer.cc
View File

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

8
webrtc/rtc_base/copyonwritebuffer.h
View File

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

4
webrtc/rtc_base/copyonwritebuffer_unittest.cc
View File

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

6
webrtc/rtc_base/cpu_time.cc
View File

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

10
webrtc/rtc_base/cpu_time_unittest.cc
View File

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

4
webrtc/rtc_base/crc32.cc
View File

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

2
webrtc/rtc_base/crc32.h
View File

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

4
webrtc/rtc_base/crc32_unittest.cc
View File

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

6
webrtc/rtc_base/criticalsection.cc
View File

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

10
webrtc/rtc_base/criticalsection.h
View File

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

14
webrtc/rtc_base/criticalsection_unittest.cc
View File

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

2
webrtc/rtc_base/cryptstring.cc
View File

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

4
webrtc/rtc_base/event.cc
View File

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

4
webrtc/rtc_base/event.h
View File

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

22
webrtc/rtc_base/event_tracer.cc
View File

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

4
webrtc/rtc_base/event_tracer_unittest.cc
View File

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

4
webrtc/rtc_base/event_unittest.cc
View File

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

6
webrtc/rtc_base/fakeclock.cc
View File

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

6
webrtc/rtc_base/fakeclock.h
View File

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

10
webrtc/rtc_base/fakenetwork.h
View File

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

6
webrtc/rtc_base/fakesslidentity.h
View File

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

2
webrtc/rtc_base/file.cc
View File

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

6
webrtc/rtc_base/file.h
View File

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

4
webrtc/rtc_base/file_posix.cc
View File

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

6
webrtc/rtc_base/file_unittest.cc
View File

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

6
webrtc/rtc_base/file_win.cc
View File

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

8
webrtc/rtc_base/filerotatingstream.cc
View File

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

4
webrtc/rtc_base/filerotatingstream.h
View File

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

12
webrtc/rtc_base/filerotatingstream_unittest.cc
View File

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

14
webrtc/rtc_base/fileutils.cc
View File

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

6
webrtc/rtc_base/fileutils.h
View File

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

8
webrtc/rtc_base/fileutils_unittest.cc
View File

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

8
webrtc/rtc_base/firewallsocketserver.cc
View File

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

4
webrtc/rtc_base/firewallsocketserver.h
View File

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

6
webrtc/rtc_base/flags.cc
View File

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

4
webrtc/rtc_base/flags.h
View File

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

2
webrtc/rtc_base/function_view.h
View File

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

4
webrtc/rtc_base/function_view_unittest.cc
View File

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

6
webrtc/rtc_base/gunit.h
View File

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

12
webrtc/rtc_base/helpers.cc
View File

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

2
webrtc/rtc_base/helpers.h
View File

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

8
webrtc/rtc_base/helpers_unittest.cc
View File

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

14
webrtc/rtc_base/httpbase.cc
View File

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

2
webrtc/rtc_base/httpbase.h
View File

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

6
webrtc/rtc_base/httpbase_unittest.cc
View File

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

6
webrtc/rtc_base/httpcommon-inl.h
View File

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

20
webrtc/rtc_base/httpcommon.cc
View File

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

8
webrtc/rtc_base/httpcommon.h
View File

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

6
webrtc/rtc_base/httpcommon_unittest.cc
View File

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

14
webrtc/rtc_base/httpserver.cc
View File

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

2
webrtc/rtc_base/httpserver.h
View File

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

6
webrtc/rtc_base/httpserver_unittest.cc
View File

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

20
webrtc/rtc_base/ifaddrs-android.cc
View File

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

2
webrtc/rtc_base/ifaddrs_converter.cc
View File

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

4
webrtc/rtc_base/ifaddrs_converter.h
View File

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

14
webrtc/rtc_base/ipaddress.cc
View File

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

6
webrtc/rtc_base/ipaddress.h
View File

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

4
webrtc/rtc_base/ipaddress_unittest.cc
View File

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

2
webrtc/rtc_base/json.cc
View File

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

4
webrtc/rtc_base/json_unittest.cc
View File

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

Some files were not shown because too many files have changed in this diff Show More