Revert of Update build files to use webrtc_overrides in Chromium instead of overrides.

webrtc/base/base.gyp

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'includes': [ '../build/common.gypi', ],
@@ skipping 66 matching lines @@
         'thread_checker.h',
         'thread_checker_impl.cc',
         'thread_checker_impl.h',
         'timeutils.cc',
         'timeutils.h',
         'trace_event.h',
       ],
       'conditions': [
         ['build_with_chromium==1', {
           'include_dirs': [
-            '../../webrtc_overrides',
+            '../overrides',
           ],
           'sources!': [
             'basictypes.h',
             'constructormagic.h',
             'logging.cc',
             'logging.h',
           ],
         }],
       ],
     },
@@ skipping 233 matching lines @@
         'windowpicker.h',
         'windowpickerfactory.h',
         'winfirewall.cc',
         'winfirewall.h',
         'winping.cc',
         'winping.h',
         'worker.cc',
         'worker.h',
         'x11windowpicker.cc',
         'x11windowpicker.h',
-        '../../webrtc_overrides/webrtc/base/logging.cc',
-        '../../webrtc_overrides/webrtc/base/logging.h',
-        '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
+        '../overrides/webrtc/base/logging.cc',
+        '../overrides/webrtc/base/logging.h',
+        '../overrides/webrtc/base/win32socketinit.cc',
       ],
       # TODO(henrike): issue 3307, make rtc_base build without disabling
       # these flags.
       'cflags!': [
         '-Wextra',
         '-Wall',
       ],
       'cflags_cc!': [
         '-Wnon-virtual-dtor',
       ],
       'direct_dependent_settings': {
         'cflags_cc!': [
           '-Wnon-virtual-dtor',
         ],
         'defines': [
           'FEATURE_ENABLE_SSL',
         ],
       },
       'include_dirs': [
         '../../third_party/jsoncpp/overrides/include',
         '../../third_party/jsoncpp/source/include',
       ],
       'conditions': [
         ['build_with_chromium==1', {
           'include_dirs': [
-            '../../webrtc_overrides',
+            '../overrides',
             '../../boringssl/src/include',
           ],
           'sources!': [
             'atomicops.h',
             'bandwidthsmoother.cc',
             'bandwidthsmoother.h',
             'bind.h',
             'callback.h',
             'constructormagic.h',
             'dbus.cc',
@@ skipping 94 matching lines @@
               ],
               'defines': [
                 # When defined changes the include path for json.h to where it
                 # is expected to be when building json outside of the standalone
                 # build.
                 'WEBRTC_EXTERNAL_JSON',
               ],
             }],
           ],
           'sources!': [
-            '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
-            '../../webrtc_overrides/webrtc/base/logging.cc',
-            '../../webrtc_overrides/webrtc/base/logging.h',
+            '../overrides/webrtc/base/win32socketinit.cc',
+            '../overrides/webrtc/base/logging.cc',
+            '../overrides/webrtc/base/logging.h',
           ],
         }],
         ['use_openssl==1', {
           'defines': [
             'SSL_USE_OPENSSL',
             'HAVE_OPENSSL_SSL_H',
           ],
           'direct_dependent_settings': {
             'defines': [
               'SSL_USE_OPENSSL',
@@ skipping 233 matching lines @@
         ['OS!="linux" and OS!="android"', {
           'sources!': [
             'linux.cc',
             'linux.h',
           ],
         }],
       ],
     },
   ],
 }