Update to use third_party/webrtc_overrides instead of third_party/webrtc/overrides.

This is one step in moving the overrides files from WebRTC to Chromium. See bug comment #65 for all steps.

Depends on https://codereview.chromium.org/1345873004/ and a WebRTC roll (specifically https://codereview.webrtc.org/1345313004/).

BUG=468375

Review URL: https://codereview.chromium.org/1357913002

Cr-Commit-Position: refs/heads/master@{#351554}

content/renderer/media/DEPS

@@ -3,5 +3,5 @@ include_rules = [
   # For video copying, cropping and scaling.
   # TODO(wuchengli): remove this when RTCVideoEncoder supports zero copy.
   "+third_party/libyuv",
+  '+third_party/webrtc_overrides',
 ]
-

content/renderer/media/webrtc_logging.cc

@@ -6,7 +6,7 @@
 
 #include "base/time/time.h"
 #include "content/public/renderer/webrtc_log_message_delegate.h"
-#include "third_party/webrtc/overrides/webrtc/base/logging.h"
+#include "third_party/webrtc_overrides/webrtc/base/logging.h"
 
 namespace content {
 

jingle/glue/DEPS

@@ -2,4 +2,5 @@
 include_rules = [
   "+third_party/libjingle/overrides",
   "+third_party/webrtc",
-]
\ No newline at end of file
+  '+third_party/webrtc_overrides',
+]

jingle/glue/logging_unittest.cc

@@ -17,7 +17,7 @@
 // libjingle style logging is used.
 #define LOGGING_INSIDE_WEBRTC
 
-#include "third_party/webrtc/overrides/webrtc/base/logging.h"
+#include "third_party/webrtc_overrides/webrtc/base/logging.h"
 
 #if defined(OS_WIN)
 static const wchar_t* const log_file_name = L"libjingle_logging.log";

third_party/libjingle/BUILD.gn

@@ -27,7 +27,7 @@ config("jingle_unexported_configs") {
 
   include_dirs = [
     "overrides",
-    "../../third_party/webrtc/overrides",
+    "../../third_party/webrtc_overrides",
     "source",
     "../../testing/gtest/include",
     "../../third_party",
@@ -46,7 +46,7 @@ config("jingle_unexported_configs") {
 # From third_party/libjingle/libjingle.gyp's target_defaults.
 config("jingle_public_configs") {
   include_dirs = [
-    "../../third_party/webrtc/overrides",
+    "../../third_party/webrtc_overrides",
     "overrides",
     "source",
     "../../testing/gtest/include",

third_party/libjingle/libjingle.gyp

@@ -46,7 +46,7 @@
     },
     'include_dirs': [
       './overrides',
-      '../../third_party/webrtc/overrides',
+      '../../third_party/webrtc_overrides',
       './<(libjingle_source)',
       '../..',
       '../../testing/gtest/include',
@@ -66,7 +66,7 @@
     ],
     'direct_dependent_settings': {
       'include_dirs': [
-        '../../third_party/webrtc/overrides',
+        '../../third_party/webrtc_overrides',
         './overrides',
         './<(libjingle_source)',
         '../..',

third_party/libjingle/libjingle_nacl.gyp

@@ -271,7 +271,7 @@
         'include_dirs': [
           './overrides',
           './<(libjingle_source)',
-          '../../third_party/webrtc/overrides',
+          '../../third_party/webrtc_overrides',
           '../../third_party',
           '../../third_party/webrtc',
         ],

third_party/libjingle/overrides/DEPS

 include_rules = [
   '+base',
   '+third_party/webrtc',
+  '+third_party/webrtc_overrides',
 ]

third_party/libjingle/overrides/init_webrtc.cc

@@ -13,7 +13,7 @@
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/trace_event/trace_event.h"
-#include "third_party/webrtc/overrides/webrtc/base/logging.h"
+#include "third_party/webrtc_overrides/webrtc/base/logging.h"
 #include "third_party/webrtc/system_wrappers/interface/cpu_info.h"
 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h"