Reland "Move webrtc/{base => rtc_base}" (https://codereview.webrtc.org/2877023002)

Reland the base->rtc_base without adding stub headers (will be
done in follow-up CL). This preserves git blame history of all files.

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

Change-Id: Iea3bb6f3f67b8374c96337b63e8f5aa3e6181012
Reviewed-on: https://chromium-review.googlesource.com/554611
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18821}

PRESUBMIT.py

@@ -32,6 +32,7 @@ CPPLINT_BLACKLIST = [
   'webrtc/modules/video_capture',
   'webrtc/p2p',
   'webrtc/pc',
+  'webrtc/rtc_base',
   'webrtc/sdk/android/src/jni',
   'webrtc/sdk/objc',
   'webrtc/system_wrappers',

webrtc/DEPS

@@ -21,6 +21,7 @@ include_rules = [
   "+webrtc/api",
   "+webrtc/base",
   "+webrtc/modules/include",
+  "+webrtc/rtc_base",
   "+webrtc/test",
   "+webrtc/tools",
 ]

webrtc/base/Dummy.java

@@ -0,0 +1,9 @@
+/**
+ * This class only exists as glue in a transition.
+ * TODO(kjellander): Remove.
+ * See https://bugs.webrtc.org/7634 for more details.
+ */
+class Dummy {
+  Dummy() {
+  }
+}

webrtc/examples/BUILD.gn

@@ -58,7 +58,7 @@ if (is_android) {
       ":AppRTCMobile_javalib",
       ":AppRTCMobile_resources",
       "//base:base_java",
-      "//webrtc/base:base_java",
+      "//webrtc/rtc_base:base_java",
     ]
 
     shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ]
@@ -94,9 +94,9 @@ if (is_android) {
 
     deps = [
       ":AppRTCMobile_resources",
-      "//webrtc/base:base_java",
       "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java",
       "//webrtc/modules/audio_device:audio_device_java",
+      "//webrtc/rtc_base:base_java",
       "//webrtc/sdk/android:libjingle_peerconnection_java",
       "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java",
     ]

webrtc/modules/audio_device/BUILD.gn

@@ -355,7 +355,7 @@ if (!build_with_chromium && is_android) {
       "android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java",
     ]
     deps = [
-      "//webrtc/base:base_java",
+      "//webrtc/rtc_base:base_java",
     ]
   }
 }

webrtc/rtc_base/array_view.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ARRAY_VIEW_H_
+#ifndef WEBRTC_RTC_BASE_ARRAY_VIEW_H_
-#define WEBRTC_BASE_ARRAY_VIEW_H_
+#define WEBRTC_RTC_BASE_ARRAY_VIEW_H_
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/type_traits.h"
@@ -250,4 +250,4 @@ inline ArrayView<T> MakeArrayView(T* data, size_t size) {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ARRAY_VIEW_H_
+#endif  // WEBRTC_RTC_BASE_ARRAY_VIEW_H_

webrtc/rtc_base/arraysize.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ARRAYSIZE_H_
+#ifndef WEBRTC_RTC_BASE_ARRAYSIZE_H_
-#define WEBRTC_BASE_ARRAYSIZE_H_
+#define WEBRTC_RTC_BASE_ARRAYSIZE_H_
 
 #include <stddef.h>
 
@@ -28,4 +28,4 @@ template <typename T, size_t N> char (&ArraySizeHelper(T (&array)[N]))[N];
 
 #define arraysize(array) (sizeof(ArraySizeHelper(array)))
 
-#endif  // WEBRTC_BASE_ARRAYSIZE_H_
+#endif  // WEBRTC_RTC_BASE_ARRAYSIZE_H_

webrtc/rtc_base/asyncinvoker-inl.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ASYNCINVOKER_INL_H_
+#ifndef WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_
-#define WEBRTC_BASE_ASYNCINVOKER_INL_H_
+#define WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_
 
 #include "webrtc/base/atomicops.h"
 #include "webrtc/base/bind.h"
@@ -53,4 +53,4 @@ class FireAndForgetAsyncClosure : public AsyncClosure {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ASYNCINVOKER_INL_H_
+#endif  // WEBRTC_RTC_BASE_ASYNCINVOKER_INL_H_

webrtc/rtc_base/asyncinvoker.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ASYNCINVOKER_H_
+#ifndef WEBRTC_RTC_BASE_ASYNCINVOKER_H_
-#define WEBRTC_BASE_ASYNCINVOKER_H_
+#define WEBRTC_RTC_BASE_ASYNCINVOKER_H_
 
 #include <memory>
 #include <utility>
@@ -218,4 +218,4 @@ class GuardedAsyncInvoker : public sigslot::has_slots<> {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ASYNCINVOKER_H_
+#endif  // WEBRTC_RTC_BASE_ASYNCINVOKER_H_

webrtc/rtc_base/asyncpacketsocket.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ASYNCPACKETSOCKET_H_
+#ifndef WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_
-#define WEBRTC_BASE_ASYNCPACKETSOCKET_H_
+#define WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/dscp.h"
@@ -140,4 +140,4 @@ class AsyncPacketSocket : public sigslot::has_slots<> {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ASYNCPACKETSOCKET_H_
+#endif  // WEBRTC_RTC_BASE_ASYNCPACKETSOCKET_H_

webrtc/rtc_base/asyncresolverinterface.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ASYNCRESOLVERINTERFACE_H_
+#ifndef WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_
-#define WEBRTC_BASE_ASYNCRESOLVERINTERFACE_H_
+#define WEBRTC_RTC_BASE_ASYNCRESOLVERINTERFACE_H_
 
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socketaddress.h"

webrtc/rtc_base/asyncsocket.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ASYNCSOCKET_H_
+#ifndef WEBRTC_RTC_BASE_ASYNCSOCKET_H_
-#define WEBRTC_BASE_ASYNCSOCKET_H_
+#define WEBRTC_RTC_BASE_ASYNCSOCKET_H_
 
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socket.h"
@@ -80,4 +80,4 @@ class AsyncSocketAdapter : public AsyncSocket, public sigslot::has_slots<> {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ASYNCSOCKET_H_
+#endif  // WEBRTC_RTC_BASE_ASYNCSOCKET_H_

webrtc/rtc_base/asynctcpsocket.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ASYNCTCPSOCKET_H_
+#ifndef WEBRTC_RTC_BASE_ASYNCTCPSOCKET_H_
-#define WEBRTC_BASE_ASYNCTCPSOCKET_H_
+#define WEBRTC_RTC_BASE_ASYNCTCPSOCKET_H_
 
 #include <memory>
 
@@ -105,4 +105,4 @@ class AsyncTCPSocket : public AsyncTCPSocketBase {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ASYNCTCPSOCKET_H_
+#endif  // WEBRTC_RTC_BASE_ASYNCTCPSOCKET_H_

webrtc/rtc_base/asyncudpsocket.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ASYNCUDPSOCKET_H_
+#ifndef WEBRTC_RTC_BASE_ASYNCUDPSOCKET_H_
-#define WEBRTC_BASE_ASYNCUDPSOCKET_H_
+#define WEBRTC_RTC_BASE_ASYNCUDPSOCKET_H_
 
 #include <memory>
 
@@ -64,4 +64,4 @@ class AsyncUDPSocket : public AsyncPacketSocket {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_ASYNCUDPSOCKET_H_
+#endif  // WEBRTC_RTC_BASE_ASYNCUDPSOCKET_H_

webrtc/rtc_base/atomicops.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_ATOMICOPS_H_
+#ifndef WEBRTC_RTC_BASE_ATOMICOPS_H_
-#define WEBRTC_BASE_ATOMICOPS_H_
+#define WEBRTC_RTC_BASE_ATOMICOPS_H_
 
 #if defined(WEBRTC_WIN)
 // Include winsock2.h before including <windows.h> to maintain consistency with
@@ -84,4 +84,4 @@ class AtomicOps {
 
 }
 
-#endif  // WEBRTC_BASE_ATOMICOPS_H_
+#endif  // WEBRTC_RTC_BASE_ATOMICOPS_H_

webrtc/rtc_base/base64.h

@@ -9,8 +9,8 @@
 //* intact.
 //*********************************************************************
 
-#ifndef WEBRTC_BASE_BASE64_H__
+#ifndef WEBRTC_RTC_BASE_BASE64_H_
-#define WEBRTC_BASE_BASE64_H__
+#define WEBRTC_RTC_BASE_BASE64_H_
 
 #include <string>
 #include <vector>
@@ -120,4 +120,4 @@ class Base64 {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_BASE64_H__
+#endif  // WEBRTC_RTC_BASE_BASE64_H_

webrtc/rtc_base/basictypes.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_BASICTYPES_H_
+#ifndef WEBRTC_RTC_BASE_BASICTYPES_H_
-#define WEBRTC_BASE_BASICTYPES_H_
+#define WEBRTC_RTC_BASE_BASICTYPES_H_
 
 #include <stddef.h>  // for NULL, size_t
 #include <stdint.h>  // for uintptr_t and (u)int_t types.
@@ -67,4 +67,4 @@ typedef int socklen_t;
 
 #endif  // __cplusplus
 
-#endif  // WEBRTC_BASE_BASICTYPES_H_
+#endif  // WEBRTC_RTC_BASE_BASICTYPES_H_

webrtc/rtc_base/bind.h

@@ -58,8 +58,8 @@
 //   }
 //
 
-#ifndef WEBRTC_BASE_BIND_H_
+#ifndef WEBRTC_RTC_BASE_BIND_H_
-#define WEBRTC_BASE_BIND_H_
+#define WEBRTC_RTC_BASE_BIND_H_
 
 #include <tuple>
 #include <type_traits>
@@ -281,4 +281,4 @@ Functor<FP_T(NONAME), R, Args...> Bind(
 
 #undef NONAME
 
-#endif  // WEBRTC_BASE_BIND_H_
+#endif  // WEBRTC_RTC_BASE_BIND_H_

webrtc/rtc_base/bitbuffer.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_BITBUFFER_H_
+#ifndef WEBRTC_RTC_BASE_BITBUFFER_H_
-#define WEBRTC_BASE_BITBUFFER_H_
+#define WEBRTC_RTC_BASE_BITBUFFER_H_
 
 #include <stdint.h>  // For integer types.
 #include <stddef.h>  // For size_t.
@@ -123,4 +123,4 @@ class BitBufferWriter : public BitBuffer {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_BITBUFFER_H_
+#endif  // WEBRTC_RTC_BASE_BITBUFFER_H_

webrtc/rtc_base/buffer.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_BUFFER_H_
+#ifndef WEBRTC_RTC_BASE_BUFFER_H_
-#define WEBRTC_BASE_BUFFER_H_
+#define WEBRTC_RTC_BASE_BUFFER_H_
 
 #include <algorithm>
 #include <cstring>
@@ -380,4 +380,4 @@ using Buffer = BufferT<uint8_t>;
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_BUFFER_H_
+#endif  // WEBRTC_RTC_BASE_BUFFER_H_

webrtc/rtc_base/bufferqueue.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_BUFFERQUEUE_H_
+#ifndef WEBRTC_RTC_BASE_BUFFERQUEUE_H_
-#define WEBRTC_BASE_BUFFERQUEUE_H_
+#define WEBRTC_RTC_BASE_BUFFERQUEUE_H_
 
 #include <deque>
 #include <vector>
@@ -58,4 +58,4 @@ class BufferQueue {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_BUFFERQUEUE_H_
+#endif  // WEBRTC_RTC_BASE_BUFFERQUEUE_H_

webrtc/rtc_base/bytebuffer.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_BYTEBUFFER_H_
+#ifndef WEBRTC_RTC_BASE_BYTEBUFFER_H_
-#define WEBRTC_BASE_BYTEBUFFER_H_
+#define WEBRTC_RTC_BASE_BYTEBUFFER_H_
 
 #include <string>
 
@@ -136,4 +136,4 @@ class ByteBufferReader : public ByteBuffer {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_BYTEBUFFER_H_
+#endif  // WEBRTC_RTC_BASE_BYTEBUFFER_H_

webrtc/rtc_base/byteorder.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_BYTEORDER_H_
+#ifndef WEBRTC_RTC_BASE_BYTEORDER_H_
-#define WEBRTC_BASE_BYTEORDER_H_
+#define WEBRTC_RTC_BASE_BYTEORDER_H_
 
 #if defined(WEBRTC_POSIX) && !defined(__native_client__)
 #include <arpa/inet.h>
@@ -175,4 +175,4 @@ inline uint64_t NetworkToHost64(uint64_t n) {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_BYTEORDER_H_
+#endif  // WEBRTC_RTC_BASE_BYTEORDER_H_

webrtc/rtc_base/callback.h

@@ -59,8 +59,8 @@
 //   my_callback = Callback1<int, int>();
 //   cout << my_callback.empty() << endl;  // true
 
-#ifndef WEBRTC_BASE_CALLBACK_H_
+#ifndef WEBRTC_RTC_BASE_CALLBACK_H_
-#define WEBRTC_BASE_CALLBACK_H_
+#define WEBRTC_RTC_BASE_CALLBACK_H_
 
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
@@ -257,4 +257,4 @@ class Callback5 {
 };
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_CALLBACK_H_
+#endif  // WEBRTC_RTC_BASE_CALLBACK_H_

webrtc/rtc_base/callback.h.pump

@@ -54,8 +54,8 @@
 //   my_callback = Callback1<int, int>();
 //   cout << my_callback.empty() << endl;  // true
 
-#ifndef WEBRTC_BASE_CALLBACK_H_
+#ifndef WEBRTC_RTC_BASE_CALLBACK_H_
-#define WEBRTC_BASE_CALLBACK_H_
+#define WEBRTC_RTC_BASE_CALLBACK_H_
 
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
@@ -100,4 +100,4 @@ class Callback$i {
 ]]
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_CALLBACK_H_
+#endif  // WEBRTC_RTC_BASE_CALLBACK_H_

webrtc/rtc_base/checks.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_CHECKS_H_
+#ifndef WEBRTC_RTC_BASE_CHECKS_H_
-#define WEBRTC_BASE_CHECKS_H_
+#define WEBRTC_RTC_BASE_CHECKS_H_
 
 #include "webrtc/typedefs.h"
 
@@ -286,4 +286,4 @@ inline T CheckedDivExact(T a, T b) {
 
 #endif  // __cplusplus
 
-#endif  // WEBRTC_BASE_CHECKS_H_
+#endif  // WEBRTC_RTC_BASE_CHECKS_H_

webrtc/rtc_base/compile_assert_c.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_COMPILE_ASSERT_C_H_
+#ifndef WEBRTC_RTC_BASE_COMPILE_ASSERT_C_H_
-#define WEBRTC_BASE_COMPILE_ASSERT_C_H_
+#define WEBRTC_RTC_BASE_COMPILE_ASSERT_C_H_
 
 // Use this macro to verify at compile time that certain restrictions are met.
 // The argument is the boolean expression to evaluate.
@@ -18,4 +18,4 @@
 // Note: In C++, use static_assert instead!
 #define RTC_COMPILE_ASSERT(expression) switch (0) {case 0: case expression:;}
 
-#endif  // WEBRTC_BASE_COMPILE_ASSERT_C_H_
+#endif  // WEBRTC_RTC_BASE_COMPILE_ASSERT_C_H_

webrtc/rtc_base/constructormagic.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_CONSTRUCTORMAGIC_H_
+#ifndef WEBRTC_RTC_BASE_CONSTRUCTORMAGIC_H_
-#define WEBRTC_BASE_CONSTRUCTORMAGIC_H_
+#define WEBRTC_RTC_BASE_CONSTRUCTORMAGIC_H_
 
 // Put this in the declarations for a class to be unassignable.
 #define RTC_DISALLOW_ASSIGN(TypeName) \
@@ -31,4 +31,4 @@
   TypeName() = delete;                               \
   RTC_DISALLOW_COPY_AND_ASSIGN(TypeName)
 
-#endif  // WEBRTC_BASE_CONSTRUCTORMAGIC_H_
+#endif  // WEBRTC_RTC_BASE_CONSTRUCTORMAGIC_H_

webrtc/rtc_base/copyonwritebuffer.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_COPYONWRITEBUFFER_H_
+#ifndef WEBRTC_RTC_BASE_COPYONWRITEBUFFER_H_
-#define WEBRTC_BASE_COPYONWRITEBUFFER_H_
+#define WEBRTC_RTC_BASE_COPYONWRITEBUFFER_H_
 
 #include <algorithm>
 #include <utility>
@@ -238,4 +238,4 @@ class CopyOnWriteBuffer {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_COPYONWRITEBUFFER_H_
+#endif  // WEBRTC_RTC_BASE_COPYONWRITEBUFFER_H_

webrtc/rtc_base/cpu_time.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_CPU_TIME_H_
+#ifndef WEBRTC_RTC_BASE_CPU_TIME_H_
-#define WEBRTC_BASE_CPU_TIME_H_
+#define WEBRTC_RTC_BASE_CPU_TIME_H_
 
 #include <stdint.h>
 
@@ -25,4 +25,4 @@ int64_t GetThreadCpuTimeNanos();
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_CPU_TIME_H_
+#endif  // WEBRTC_RTC_BASE_CPU_TIME_H_

webrtc/rtc_base/crc32.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_CRC32_H_
+#ifndef WEBRTC_RTC_BASE_CRC32_H_
-#define WEBRTC_BASE_CRC32_H_
+#define WEBRTC_RTC_BASE_CRC32_H_
 
 #include <string>
 
@@ -31,4 +31,4 @@ inline uint32_t ComputeCrc32(const std::string& str) {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_CRC32_H_
+#endif  // WEBRTC_RTC_BASE_CRC32_H_

webrtc/rtc_base/criticalsection.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_CRITICALSECTION_H_
+#ifndef WEBRTC_RTC_BASE_CRITICALSECTION_H_
-#define WEBRTC_BASE_CRITICALSECTION_H_
+#define WEBRTC_RTC_BASE_CRITICALSECTION_H_
 
 #include "webrtc/base/atomicops.h"
 #include "webrtc/base/checks.h"
@@ -153,4 +153,4 @@ class SCOPED_LOCKABLE GlobalLockScope {
 
 } // namespace rtc
 
-#endif // WEBRTC_BASE_CRITICALSECTION_H_
+#endif // WEBRTC_RTC_BASE_CRITICALSECTION_H_

webrtc/rtc_base/cryptstring.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef _WEBRTC_BASE_CRYPTSTRING_H_
+#ifndef WEBRTC_RTC_BASE_CRYPTSTRING_H_
-#define _WEBRTC_BASE_CRYPTSTRING_H_
+#define WEBRTC_RTC_BASE_CRYPTSTRING_H_
 
 #include <string.h>
 
@@ -74,7 +74,7 @@ public:
     length_ = 0;
     storage_[0] = 0;
   }
-  
+
   void Append(const std::string & text) {
     Append(text.data(), text.length());
   }
@@ -85,7 +85,7 @@ public:
     length_ += length;
     storage_[length_] = '\0';
   }
-  
+
   void Append(const CryptString * password) {
     size_t len = password->GetLength();
     EnsureStorage(length_ + len + 1);
@@ -121,7 +121,7 @@ public:
 
     if (old_capacity) {
       memcpy(storage_, old_storage, length_);
-    
+
       // zero memory in a way that an optimizer won't optimize it out
       old_storage[0] = 0;
       for (size_t i = 1; i < old_capacity; i++) {
@@ -129,7 +129,7 @@ public:
       }
       delete[] old_storage;
     }
-  }  
+  }
 
   ~FormatCryptString() {
     if (capacity_) {
@@ -164,4 +164,4 @@ class InsecureCryptStringImpl : public CryptStringImpl {
 
 }
 
-#endif  // _WEBRTC_BASE_CRYPTSTRING_H_
+#endif  // WEBRTC_RTC_BASE_CRYPTSTRING_H_

webrtc/rtc_base/deprecation.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_DEPRECATION_H_
+#ifndef WEBRTC_RTC_BASE_DEPRECATION_H_
-#define WEBRTC_BASE_DEPRECATION_H_
+#define WEBRTC_RTC_BASE_DEPRECATION_H_
 
 // Annotate the declarations of deprecated functions with this to cause a
 // compiler warning when they're used. Like so:
@@ -42,4 +42,4 @@
 #define RTC_DEPRECATED
 #endif
 
-#endif  // WEBRTC_BASE_DEPRECATION_H_
+#endif  // WEBRTC_RTC_BASE_DEPRECATION_H_

webrtc/rtc_base/dscp.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_DSCP_H_
+#ifndef WEBRTC_RTC_BASE_DSCP_H_
-#define WEBRTC_BASE_DSCP_H_
+#define WEBRTC_RTC_BASE_DSCP_H_
 
 namespace rtc {
 // Differentiated Services Code Point.
@@ -42,4 +42,4 @@ enum DiffServCodePoint {
 
 }  // namespace rtc
 
- #endif  // WEBRTC_BASE_DSCP_H_
+ #endif  // WEBRTC_RTC_BASE_DSCP_H_

webrtc/rtc_base/event.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_EVENT_H__
+#ifndef WEBRTC_RTC_BASE_EVENT_H_
-#define WEBRTC_BASE_EVENT_H__
+#define WEBRTC_RTC_BASE_EVENT_H_
 
 #include "webrtc/base/constructormagic.h"
 #if defined(WEBRTC_WIN)
@@ -51,4 +51,4 @@ class Event {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_EVENT_H__
+#endif  // WEBRTC_RTC_BASE_EVENT_H_

webrtc/rtc_base/event_tracer.h

@@ -23,8 +23,8 @@
 //
 // Parameters for the above two functions are described in trace_event.h.
 
-#ifndef WEBRTC_BASE_EVENT_TRACER_H_
+#ifndef WEBRTC_RTC_BASE_EVENT_TRACER_H_
-#define WEBRTC_BASE_EVENT_TRACER_H_
+#define WEBRTC_RTC_BASE_EVENT_TRACER_H_
 
 #include <stdio.h>
 
@@ -82,4 +82,4 @@ void ShutdownInternalTracer();
 }  // namespace tracing
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_EVENT_TRACER_H_
+#endif  // WEBRTC_RTC_BASE_EVENT_TRACER_H_

webrtc/rtc_base/fakeclock.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FAKECLOCK_H_
+#ifndef WEBRTC_RTC_BASE_FAKECLOCK_H_
-#define WEBRTC_BASE_FAKECLOCK_H_
+#define WEBRTC_RTC_BASE_FAKECLOCK_H_
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/timedelta.h"
@@ -68,4 +68,4 @@ class ScopedRealClock {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FAKECLOCK_H_
+#endif  // WEBRTC_RTC_BASE_FAKECLOCK_H_

webrtc/rtc_base/fakenetwork.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FAKENETWORK_H_
+#ifndef WEBRTC_RTC_BASE_FAKENETWORK_H_
-#define WEBRTC_BASE_FAKENETWORK_H_
+#define WEBRTC_RTC_BASE_FAKENETWORK_H_
 
 #include <memory>
 #include <string>
@@ -126,4 +126,4 @@ class FakeNetworkManager : public NetworkManagerBase,
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FAKENETWORK_H_
+#endif  // WEBRTC_RTC_BASE_FAKENETWORK_H_

webrtc/rtc_base/fakesslidentity.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FAKESSLIDENTITY_H_
+#ifndef WEBRTC_RTC_BASE_FAKESSLIDENTITY_H_
-#define WEBRTC_BASE_FAKESSLIDENTITY_H_
+#define WEBRTC_RTC_BASE_FAKESSLIDENTITY_H_
 
 #include <algorithm>
 #include <memory>
@@ -117,4 +117,4 @@ class FakeSSLIdentity : public rtc::SSLIdentity {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FAKESSLIDENTITY_H_
+#endif  // WEBRTC_RTC_BASE_FAKESSLIDENTITY_H_

webrtc/rtc_base/file.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FILE_H_
+#ifndef WEBRTC_RTC_BASE_FILE_H_
-#define WEBRTC_BASE_FILE_H_
+#define WEBRTC_RTC_BASE_FILE_H_
 
 #include <stdint.h>
 
@@ -79,4 +79,4 @@ class File {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FILE_H_
+#endif  // WEBRTC_RTC_BASE_FILE_H_

webrtc/rtc_base/filerotatingstream.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FILEROTATINGSTREAM_H_
+#ifndef WEBRTC_RTC_BASE_FILEROTATINGSTREAM_H_
-#define WEBRTC_BASE_FILEROTATINGSTREAM_H_
+#define WEBRTC_RTC_BASE_FILEROTATINGSTREAM_H_
 
 #include <memory>
 #include <string>
@@ -170,4 +170,4 @@ class CallSessionFileRotatingStream : public FileRotatingStream {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FILEROTATINGSTREAM_H_
+#endif  // WEBRTC_RTC_BASE_FILEROTATINGSTREAM_H_

webrtc/rtc_base/fileutils.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FILEUTILS_H_
+#ifndef WEBRTC_RTC_BASE_FILEUTILS_H_
-#define WEBRTC_BASE_FILEUTILS_H_
+#define WEBRTC_RTC_BASE_FILEUTILS_H_
 
 #include <string>
 
@@ -179,4 +179,4 @@ class Filesystem {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FILEUTILS_H_
+#endif  // WEBRTC_RTC_BASE_FILEUTILS_H_

webrtc/rtc_base/firewallsocketserver.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FIREWALLSOCKETSERVER_H_
+#ifndef WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_
-#define WEBRTC_BASE_FIREWALLSOCKETSERVER_H_
+#define WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_
 
 #include <vector>
 #include "webrtc/base/socketserver.h"
@@ -122,4 +122,4 @@ class FirewallManager {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FIREWALLSOCKETSERVER_H_
+#endif  // WEBRTC_RTC_BASE_FIREWALLSOCKETSERVER_H_

webrtc/rtc_base/flags.h

@@ -20,8 +20,8 @@
 // The implementation only relies and basic C++ functionality
 // and needs no special library or STL support.
 
-#ifndef WEBRTC_BASE_FLAGS_H__
+#ifndef WEBRTC_RTC_BASE_FLAGS_H_
-#define WEBRTC_BASE_FLAGS_H__
+#define WEBRTC_RTC_BASE_FLAGS_H_
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
@@ -265,4 +265,4 @@ class WindowsCommandLineArguments {
 
 }  // namespace rtc
 
-#endif  // SHARED_COMMANDLINEFLAGS_FLAGS_H__
+#endif  // SHARED_COMMANDLINEFLAGS_FLAGS_H_

webrtc/rtc_base/format_macros.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FORMAT_MACROS_H_
+#ifndef WEBRTC_RTC_BASE_FORMAT_MACROS_H_
-#define WEBRTC_BASE_FORMAT_MACROS_H_
+#define WEBRTC_RTC_BASE_FORMAT_MACROS_H_
 
 // This file defines the format macros for some integer types and is derived
 // from Chromium's base/format_macros.h.
@@ -93,4 +93,4 @@
 
 #endif
 
-#endif  // WEBRTC_BASE_FORMAT_MACROS_H_
+#endif  // WEBRTC_RTC_BASE_FORMAT_MACROS_H_

webrtc/rtc_base/function_view.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_BASE_FUNCTION_VIEW_H_
+#ifndef WEBRTC_RTC_BASE_FUNCTION_VIEW_H_
-#define WEBRTC_BASE_FUNCTION_VIEW_H_
+#define WEBRTC_RTC_BASE_FUNCTION_VIEW_H_
 
 #include <type_traits>
 #include <utility>
@@ -127,4 +127,4 @@ class FunctionView<RetT(ArgT...)> final {
 
 }  // namespace rtc
 
-#endif  // WEBRTC_BASE_FUNCTION_VIEW_H_
+#endif  // WEBRTC_RTC_BASE_FUNCTION_VIEW_H_