Move third_party/libjingle/overrides to third_party/webrtc_overrides

Remove non-existing include path references to the old libjingle
source dir as well.

Don't update any targets to reduce complexity in landing
the switch in https://codereview.chromium.org/2022833002 first.
After that's done the target should be moved into third_party/webrtc_overrides.

BUG=webrtc:4256

Review-Url: https://codereview.chromium.org/2082473002
Cr-Commit-Position: refs/heads/master@{#400755}

content/DEPS

@@ -66,6 +66,7 @@ include_rules = [
   "+third_party/sqlite",
   "+third_party/khronos",
   "+third_party/webrtc",
+  "+third_party/webrtc_overrides",
   "+third_party/zlib/google",
   "+third_party/WebKit/public/platform",
   "+third_party/WebKit/public/web",

content/renderer/renderer_main.cc

@@ -52,7 +52,7 @@
 #endif
 
 #if defined(ENABLE_WEBRTC)
-#include "third_party/libjingle/overrides/init_webrtc.h"
+#include "third_party/webrtc_overrides/init_webrtc.h"
 #endif
 
 #if defined(USE_OZONE)

content/zygote/zygote_main_linux.cc

@@ -64,7 +64,7 @@
 #endif
 
 #if defined(ENABLE_WEBRTC)
-#include "third_party/libjingle/overrides/init_webrtc.h"
+#include "third_party/webrtc_overrides/init_webrtc.h"
 #endif
 
 #if defined(SANITIZER_COVERAGE)

jingle/glue/DEPS

 # Needed by logging_unittest.cc since it tests the overrides.
 include_rules = [
-  "+third_party/libjingle/overrides",
   "+third_party/webrtc",
   '+third_party/webrtc_overrides',
 ]

third_party/libjingle/BUILD.gn

@@ -26,9 +26,7 @@ config("jingle_unexported_configs") {
   ]
 
   include_dirs = [
-    "overrides",
     "../../third_party/webrtc_overrides",
-    "source",
     "../../testing/gtest/include",
     "../../third_party",
     "../../third_party/libyuv/include",
@@ -40,8 +38,6 @@ config("jingle_unexported_configs") {
 config("jingle_public_configs") {
   include_dirs = [
     "../../third_party/webrtc_overrides",
-    "overrides",
-    "source",
     "../../testing/gtest/include",
     "../../third_party",
   ]
@@ -225,7 +221,7 @@ static_library("libjingle") {
     ]
   } else {
     # Otherwise, we just add the field_trial which redirects to base.
-    sources += [ "overrides/field_trial.cc" ]
+    sources += [ "../webrtc_overrides/field_trial.cc" ]
   }
 
   configs += [ ":jingle_unexported_configs" ]
@@ -233,10 +229,13 @@ static_library("libjingle") {
 }
 
 if (enable_webrtc) {
+  # TODO(kjellander): Move this target into //third_party/webrtc_overrides as
+  # soon as the work in bugs.webrtc.org/4256 has gotten rid of the duplicated
+  # source listings above.
   source_set("libjingle_webrtc") {
     sources = [
-      "overrides/init_webrtc.cc",
-      "overrides/init_webrtc.h",
+      "../webrtc_overrides/init_webrtc.cc",
+      "../webrtc_overrides/init_webrtc.h",
     ]
     configs += [ ":jingle_unexported_configs" ]
     public_configs = [ ":jingle_public_configs" ]

third_party/libjingle/libjingle.gyp

@@ -28,9 +28,7 @@
       'WEBRTC_CHROMIUM_BUILD',
     ],
     'include_dirs': [
-      './overrides',
       '../../third_party/webrtc_overrides',
-      './source',
       '../..',
       '../../testing/gtest/include',
       '../../third_party',
@@ -50,8 +48,6 @@
     'direct_dependent_settings': {
       'include_dirs': [
         '../../third_party/webrtc_overrides',
-        './overrides',
-        './source',
         '../..',
         '../../testing/gtest/include',
         '../../third_party',
@@ -363,12 +359,16 @@
           ],
         },  # target libjingle_webrtc_common
         {
+          # TODO(kjellander): Move this target into
+          # //third_party/webrtc_overrides as soon as the work in
+          # bugs.webrtc.org/4256 has gotten rid of the duplicated source
+          # listings above.
           # GN version: //third_party/libjingle:libjingle_webrtc
           'target_name': 'libjingle_webrtc',
           'type': 'static_library',
           'sources': [
-            'overrides/init_webrtc.cc',
-            'overrides/init_webrtc.h',
+            '../webrtc_overrides/init_webrtc.cc',
+            '../webrtc_overrides/init_webrtc.h',
           ],
           'dependencies': [
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing',

third_party/libjingle/libjingle_common.gypi

@@ -9,7 +9,7 @@
     'webrtc_xmpp': "../webrtc/libjingle/xmpp",
   },
   'sources': [
-    'overrides/field_trial.cc',
+    '../webrtc_overrides/field_trial.cc',
     '<(webrtc_p2p)/base/asyncstuntcpsocket.cc',
     '<(webrtc_p2p)/base/asyncstuntcpsocket.h',
     '<(webrtc_p2p)/base/basicpacketsocketfactory.cc',

third_party/libjingle/libjingle_nacl.gyp

@@ -4,7 +4,6 @@
 
 {
   'variables': {
-    'libjingle_source': "source",
     'webrtc_base': "../webrtc/base",
     'webrtc_xmllite': "../webrtc/libjingle/xmllite",
     'webrtc_p2p': "../webrtc/p2p",
@@ -44,7 +43,6 @@
         'timezone=_timezone',
       ],
       'include_dirs': [
-        './<(libjingle_source)',
         '../',
       ],
       'includes': ['libjingle_common.gypi', ],
@@ -254,7 +252,7 @@
       'sources!': [
         # For NACL, we have the field_trial_default and don't need the
         # field_trail.cc.
-        'overrides/field_trial.cc',
+        '../webrtc_overrides/field_trial.cc',
       ],
       'sources/': [
         ['exclude', '/mac[a-z]+\\.(h|cc)$'],
@@ -269,8 +267,6 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          './overrides',
-          './<(libjingle_source)',
           '../../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.h → third_party/webrtc_overrides/init_webrtc.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
-#define THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
+#ifndef THIRD_PARTY_WEBRTC_OVERRIDES_INIT_WEBRTC_H_
+#define THIRD_PARTY_WEBRTC_OVERRIDES_INIT_WEBRTC_H_
 
 // Initialize WebRTC. Call this explicitly to initialize WebRTC module
 // (before initializing the sandbox in Chrome) and hook up Chrome+WebRTC
 // integration such as common logging and tracing.
 bool InitializeWebRtcModule();
 
-#endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
+#endif // THIRD_PARTY_WEBRTC_OVERRIDES_INIT_WEBRTC_H_