Move navigation interception component to content/components

android_webview/android_webview.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'libwebviewchromium',
       'type': 'shared_library',
       'android_unmangled_name': 1,
       'dependencies': [
         '../content/content.gyp:content',
+        '../content/content.gyp:navigation_interception',
         '../android_webview/native/webview_native.gyp:webview_native',
-        '../chrome/browser/component/components.gyp:navigation_interception',
         '../chrome/browser/component/components.gyp:web_contents_delegate_android',
         '../chrome/browser/component/components.gyp:browser_component_jni_headers',
         '../ui/ui.gyp:ui_resources',
       ],
       'include_dirs': [
         '..',
         '../skia/config',
       ],
       'ldflags': [
         # fix linking to hidden symbols and re-enable this (crbug.com/157326)
@@ skipping 57 matching lines @@
         'renderer/aw_render_process_observer.h',
         'renderer/aw_render_view_ext.cc',
         'renderer/aw_render_view_ext.h',
       ],
     },
     {
       'target_name': 'android_webview_java',
       'type': 'none',
       'dependencies': [
         '../content/content.gyp:content_java',
-        '../chrome/browser/component/components.gyp:navigation_interception_java',
+        '../content/content.gyp:navigation_interception_java',
         '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
         'package_name': 'android_webview_java',
         'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
     },
     {
       'target_name': 'android_webview_apk',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java',
-        '../chrome/browser/component/components.gyp:navigation_interception_java',
         '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
         '../chrome/chrome_resources.gyp:packed_extra_resources',
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_java',
+        '../content/content.gyp:navigation_interception_java',
         '../media/media.gyp:media_java',
         '../net/net.gyp:net_java',
         '../ui/ui.gyp:ui_java',
         'libwebviewchromium',
       ],
       'variables': {
         'package_name': 'android_webview',
         'apk_name': 'AndroidWebView',
         'manifest_package_name': 'org.chromium.android_webview',
         'java_in_dir': '../android_webview/java',
@@ skipping 17 matching lines @@
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
     {
       'target_name': 'android_webview_test_apk',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java',
         '../base/base.gyp:base_java_test_support',
-        '../chrome/browser/component/components.gyp:navigation_interception_java',
         '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
         '../chrome/chrome_resources.gyp:packed_extra_resources',
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_java',
         '../content/content.gyp:content_java_test_support',
+        '../content/content.gyp:navigation_interception_java',
         '../media/media.gyp:media_java',
         '../net/net.gyp:net_java',
         '../ui/ui.gyp:ui_java',
         'android_webview_java',
         'libwebviewchromium',
       ],
       'variables': {
         'package_name': 'android_webview_test',
         'apk_name': 'AndroidWebViewTest',
         'java_in_dir': '../android_webview/javatests',
         'resource_dir': 'res',
       },
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)/android_webview_test/assets',
           'files': [ '<!@(find <(java_in_dir)/assets -type f -name "*")' ]
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
   ],
 }