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

webrtc/build/common.gypi

 # Copyright (c) 2012 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.
 
 # This file contains common settings for building WebRTC components.
 
@@ skipping 205 matching lines @@
           # Changes settings for Chromium build.
           'WEBRTC_CHROMIUM_BUILD',
           'LOGGING_INSIDE_WEBRTC',
         ],
         'include_dirs': [
           # Include the top-level directory when building in Chrome, so we can
           # use full paths (e.g. headers inside testing/ or third_party/).
           '<(DEPTH)',
           # The overrides must be included before the WebRTC root as that's the
           # mechanism for selecting the override headers in Chromium.
-          '../../webrtc_overrides',
+          '../overrides',
           # The WebRTC root is needed to allow includes in the WebRTC code base
           # to be prefixed with webrtc/.
           '../..',
         ],
       }, {
          # Include the top-level dir so the WebRTC code can use full paths.
         'include_dirs': [
           '../..',
         ],
         'conditions': [
@@ skipping 164 matching lines @@
             # Changes settings for Mozilla build.
             'WEBRTC_MOZILLA_BUILD',
            ],
         }],
         ['build_with_chromium==1', {
           'defines': [
             # Changes settings for Chromium build.
             'WEBRTC_CHROMIUM_BUILD',
           ],
           'include_dirs': [
-            # The overrides must be included first as that is the mechanism for
+            # overrides must be included first as that is the mechanism for
             # selecting the override headers in Chromium.
-            '../../webrtc_overrides',
+            '../overrides',
             '../..',
           ],
         }, {
           'include_dirs': [
             '../..',
           ],
         }],
         ['OS=="mac"', {
           'defines': [
             'WEBRTC_MAC',
@@ skipping 26 matching lines @@
           # of a more specific macro.
           'defines': [
             'WEBRTC_POSIX',
           ],
         }],
       ],
     },
   }, # target_defaults
 }