components: Move navigation_interception into navigation_interception namespace.

BUG=238221
R=joi@chromium.org, joth@chromium.org, thestig@chromium.org

Review URL: https://codereview.chromium.org/15402004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201493 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 26 insertions, 29 deletions

diff --git a/components/navigation_interception/component_jni_registrar.cc b/components/navigation_interception/component_jni_registrar.cc
index c3fe287..9663529 100644
--- a/components/navigation_interception/component_jni_registrar.cc
+++ b/components/navigation_interception/component_jni_registrar.cc
@@ -9,7 +9,7 @@
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/navigation_interception/navigation_params_android.h"
 
-namespace components {
+namespace navigation_interception {
 
 static base::android::RegistrationMethod kComponentRegisteredMethods[] = {
   { "InterceptNavigationDelegate", RegisterInterceptNavigationDelegate },
@@ -17,8 +17,8 @@ static base::android::RegistrationMethod kComponentRegisteredMethods[] = {
 };
 
 bool RegisterNavigationInterceptionJni(JNIEnv* env) {
-  return RegisterNativeMethods(env,
-      kComponentRegisteredMethods, arraysize(kComponentRegisteredMethods));
+  return RegisterNativeMethods(
+      env, kComponentRegisteredMethods, arraysize(kComponentRegisteredMethods));
 }
 
-}  // namespace components
+}  // namespace navigation_interception
diff --git a/components/navigation_interception/component_jni_registrar.h b/components/navigation_interception/component_jni_registrar.h
index ada59b2..c79f377 100644
--- a/components/navigation_interception/component_jni_registrar.h
+++ b/components/navigation_interception/component_jni_registrar.h
@@ -7,12 +7,12 @@
 
 #include <jni.h>
 
-namespace components {
+namespace navigation_interception {
 
 // Register all JNI bindings necessary for the navigation_interception
 // component.
 bool RegisterNavigationInterceptionJni(JNIEnv* env);
 
-}  // namespace components
+}  // namespace navigation_interception
 
 #endif  // COMPONENTS_NAVIGATION_INTERCEPTION_COMPONENT_JNI_REGISTRAR_H_
diff --git a/components/navigation_interception/intercept_navigation_delegate.cc b/components/navigation_interception/intercept_navigation_delegate.cc
index 1a1df05..cc3feb4 100644
--- a/components/navigation_interception/intercept_navigation_delegate.cc
+++ b/components/navigation_interception/intercept_navigation_delegate.cc
@@ -23,7 +23,7 @@ using content::PageTransition;
 using content::RenderViewHost;
 using content::WebContents;
 
-namespace components {
+namespace navigation_interception {
 
 namespace {
 
@@ -104,4 +104,4 @@ bool RegisterInterceptNavigationDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace components
+}  // namespace navigation_interception
diff --git a/components/navigation_interception/intercept_navigation_delegate.h b/components/navigation_interception/intercept_navigation_delegate.h
index a3d14ce..c70beef 100644
--- a/components/navigation_interception/intercept_navigation_delegate.h
+++ b/components/navigation_interception/intercept_navigation_delegate.h
@@ -21,7 +21,7 @@ namespace net {
 class URLRequest;
 }
 
-namespace components {
+namespace navigation_interception {
 
 class NavigationParams;
 
@@ -64,6 +64,6 @@ class InterceptNavigationDelegate : public base::SupportsUserData::Data {
 
 bool RegisterInterceptNavigationDelegate(JNIEnv* env);
 
-}  // namespace components
+}  // namespace navigation_interception
 
 #endif  // COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle.cc b/components/navigation_interception/intercept_navigation_resource_throttle.cc
index 984eebe..390be67 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle.cc
+++ b/components/navigation_interception/intercept_navigation_resource_throttle.cc
@@ -22,7 +22,7 @@ using content::Referrer;
 using content::RenderViewHost;
 using content::ResourceRequestInfo;
 
-namespace components {
+namespace navigation_interception {
 
 namespace {
 
@@ -125,4 +125,4 @@ void InterceptNavigationResourceThrottle::OnResultObtained(
   }
 }
 
-}  // namespace components
+}  // namespace navigation_interception
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle.h b/components/navigation_interception/intercept_navigation_resource_throttle.h
index ab19556..012cd568 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle.h
+++ b/components/navigation_interception/intercept_navigation_resource_throttle.h
@@ -21,7 +21,7 @@ namespace net {
 class URLRequest;
 }
 
-namespace components {
+namespace navigation_interception {
 
 class NavigationParams;
 
@@ -54,6 +54,6 @@ class InterceptNavigationResourceThrottle : public content::ResourceThrottle {
   DISALLOW_COPY_AND_ASSIGN(InterceptNavigationResourceThrottle);
 };
 
-}  // namespace components
+}  // namespace navigation_interception
 
 #endif  // COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_RESOURCE_THROTTLE_H_
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
index 77ddb0d..fd02cc7 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
+++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
@@ -32,7 +32,7 @@ using testing::Property;
 using testing::Ne;
 using testing::Return;
 
-namespace components {
+namespace navigation_interception {
 
 namespace {
 
@@ -425,4 +425,4 @@ TEST_F(InterceptNavigationResourceThrottleTest,
   message_loop_.Run();
 }
 
-}  // namespace components
+}  // namespace navigation_interception
diff --git a/components/navigation_interception/navigation_params.cc b/components/navigation_interception/navigation_params.cc
index 48d8fb5..2bb0e94 100644
--- a/components/navigation_interception/navigation_params.cc
+++ b/components/navigation_interception/navigation_params.cc
@@ -4,7 +4,7 @@
 
 #include "components/navigation_interception/navigation_params.h"
 
-namespace components {
+namespace navigation_interception {
 
 NavigationParams::NavigationParams(const NavigationParams& other) {
   Assign(other);
@@ -38,5 +38,5 @@ void NavigationParams::Assign(const NavigationParams& other) {
   is_redirect_ = other.is_redirect();
 }
 
-}  // namespace components
+}  // namespace navigation_interception
 
diff --git a/components/navigation_interception/navigation_params.h b/components/navigation_interception/navigation_params.h
index a0810d4..0b0a731 100644
--- a/components/navigation_interception/navigation_params.h
+++ b/components/navigation_interception/navigation_params.h
@@ -10,7 +10,7 @@
 #include "content/public/common/referrer.h"
 #include "googleurl/src/gurl.h"
 
-namespace components {
+namespace navigation_interception {
 
 class NavigationParams {
  public:
@@ -32,17 +32,16 @@ class NavigationParams {
   bool is_redirect() const { return is_redirect_; }
 
  private:
+  void Assign(const NavigationParams& other);
+
   GURL url_;
   content::Referrer referrer_;
   bool has_user_gesture_;
   bool is_post_;
   content::PageTransition transition_type_;
   bool is_redirect_;
-
-  void Assign(const NavigationParams& other);
 };
 
-}  // namespace components
+}  // namespace navigation_interception
 
 #endif  // COMPONENTS_NAVIGATION_INTERCEPTION_NAVIGATION_PARAMS_H_
-
diff --git a/components/navigation_interception/navigation_params_android.cc b/components/navigation_interception/navigation_params_android.cc
index 8e8c4dd..769450f 100644
--- a/components/navigation_interception/navigation_params_android.cc
+++ b/components/navigation_interception/navigation_params_android.cc
@@ -9,7 +9,7 @@
 
 using base::android::ConvertUTF8ToJavaString;
 
-namespace components {
+namespace navigation_interception {
 
 base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams(
     JNIEnv* env,
@@ -31,4 +31,4 @@ bool RegisterNavigationParams(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace components
+}  // namespace navigation_interception
diff --git a/components/navigation_interception/navigation_params_android.h b/components/navigation_interception/navigation_params_android.h
index e1523c5..004d492 100644
--- a/components/navigation_interception/navigation_params_android.h
+++ b/components/navigation_interception/navigation_params_android.h
@@ -9,9 +9,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "components/navigation_interception/navigation_params.h"
 
-class GURL;
-
-namespace components {
+namespace navigation_interception {
 
 base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams(
     JNIEnv* env,
@@ -19,6 +17,6 @@ base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams(
 
 bool RegisterNavigationParams(JNIEnv* env);
 
-}  // namespace components
+}  // namespace navigation_interception
 
 #endif  // COMPONENTS_NAVIGATION_INTERCEPTION_NAVIGATION_PARAMS_ANDROID_H_