Move content/components/navigation_interception to src/components

components/navigation_interception.gypi

Index: components/navigation_interception.gypi
diff --git a/content/content_components_navigation_interception.gypi b/components/navigation_interception.gypi
similarity index 64%
rename from content/content_components_navigation_interception.gypi
rename to components/navigation_interception.gypi
index f4d6b8b8fcdd0408a226ab46c30f8f6ae43ea079..3e4052c082e3222509c35d5666c8916772fa2898 100644
--- a/content/content_components_navigation_interception.gypi
+++ b/components/navigation_interception.gypi
@@ -11,9 +11,11 @@
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         '../base/base.gyp:base',
+        '../content/content.gyp:content_browser',
+        '../content/content.gyp:content_common',
+        '../content/content.gyp:content_gpu',
+        '../content/content.gyp:content_renderer',
         '../net/net.gyp:net',
-        'content_browser',
-        'content_common',
       ],
       'include_dirs': [
         '..',
@@ -22,8 +24,8 @@
 
       ],
       'sources': [
-        'components/navigation_interception/intercept_navigation_resource_throttle.cc',
-        'components/navigation_interception/intercept_navigation_resource_throttle.h',
+        'navigation_interception/intercept_navigation_resource_throttle.cc',
+        'navigation_interception/intercept_navigation_resource_throttle.h',
       ],
       'conditions': [
         ['OS=="android"', {
@@ -31,10 +33,10 @@
               'navigation_interception_jni_headers',
           ],
           'sources': [
-            'components/navigation_interception/component_jni_registrar.cc',
-            'components/navigation_interception/component_jni_registrar.h',
-            'components/navigation_interception/intercept_navigation_delegate.cc',
-            'components/navigation_interception/intercept_navigation_delegate.h',
+            'navigation_interception/component_jni_registrar.cc',
+            'navigation_interception/component_jni_registrar.h',
+            'navigation_interception/intercept_navigation_delegate.cc',
+            'navigation_interception/intercept_navigation_delegate.h',
           ],
         }],
       ],
@@ -51,7 +53,7 @@
           ],
           'variables': {
             'package_name': 'navigation_interception',
-            'java_in_dir': 'components/navigation_interception/java',
+            'java_in_dir': 'navigation_interception/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
@@ -59,7 +61,7 @@
           'target_name': 'navigation_interception_jni_headers',
           'type': 'none',
           'sources': [
-            'components/navigation_interception/java/src/org/chromium/content/components/navigation_interception/InterceptNavigationDelegate.java',
+            'navigation_interception/android/java/src/org/chromium/content/components/navigation_interception/InterceptNavigationDelegate.java',
           ],
           'variables': {
             'jni_gen_dir': 'navigation_interception',