Move navigation interception component to content/components

content/components/navigation_interception/navigation_interception.gypi

Index: content/components/navigation_interception/navigation_interception.gypi
diff --git a/chrome/browser/component/navigation_interception/navigation_interception.gypi b/content/components/navigation_interception/navigation_interception.gypi
similarity index 56%
rename from chrome/browser/component/navigation_interception/navigation_interception.gypi
rename to content/components/navigation_interception/navigation_interception.gypi
index af9de6ea9bd8bae81b2452b1c456a2abaf2ea882..71efde74a3ffda7c43b7b02f761d7a4d7779a19a 100644
--- a/chrome/browser/component/navigation_interception/navigation_interception.gypi
+++ b/content/components/navigation_interception/navigation_interception.gypi
@@ -9,15 +9,15 @@
       'target_name': 'navigation_interception',
       'type': 'static_library',
       'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../content/content.gyp:content_browser',
-        '../../../content/content.gyp:content_common',
-        '../../../net/net.gyp:net',
+        '../../base/base.gyp:base',
+        '../../net/net.gyp:net',
+        '../content.gyp:content_browser',
+        '../content.gyp:content_common',
       ],
       'include_dirs': [
-        '../../../..',
-        '../../../../skia/config',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_component',
+        '../../..',
+        '../../../skia/config',
+        '<(SHARED_INTERMEDIATE_DIR)/navigation_interception',
 
       ],
       'sources': [
@@ -27,7 +27,7 @@
       'conditions': [
         ['OS=="android"', {
           'dependencies': [
-            'browser_component_jni_headers',
+              'navigation_interception_jni_headers',
           ],
           'sources': [
             'component_jni_registrar.cc',
@@ -46,13 +46,25 @@
           'target_name': 'navigation_interception_java',
           'type': 'none',
           'dependencies': [
-            '../../../base/base.gyp:base',
+            '../../base/base.gyp:base',
           ],
           'variables': {
             'package_name': 'navigation_interception',
             'java_in_dir': 'java',
           },
-          'includes': [ '../../../../build/java.gypi' ],
+          'includes': [ '../../../build/java.gypi' ],
+        },
+        {
+          'target_name': 'navigation_interception_jni_headers',
+          'type': 'none',
+          'sources': [
+            'java/src/org/chromium/chrome/browser/component/navigation_interception/InterceptNavigationDelegate.java',
+          ],
+          'variables': {
+            # We need ../ due to path name relativization of jni_gen_dir.
+            'jni_gen_dir': '../navigation_interception',
+          },
+          'includes': [ '../../../build/jni_generator.gypi' ],
         },
       ],
     }],