Add a NavigationThrottle to the public content/ interface

components/navigation_interception/intercept_navigation_delegate.h

Index: components/navigation_interception/intercept_navigation_delegate.h
diff --git a/components/navigation_interception/intercept_navigation_delegate.h b/components/navigation_interception/intercept_navigation_delegate.h
index d84969f0796fa9c14ea0120391772a792ec0d77d..0e595134e845bae4c4785ee5a45ac67664ee4bb0 100644
--- a/components/navigation_interception/intercept_navigation_delegate.h
+++ b/components/navigation_interception/intercept_navigation_delegate.h
@@ -12,7 +12,8 @@
 class GURL;
 
 namespace content {
-class ResourceThrottle;
+class NavigationHandle;
+class NavigationThrottle;
 class WebContents;
 }
 
@@ -32,9 +33,8 @@ class NavigationParams;
 // 1) the Java-side interface implementation must be associated (via the
 //    Associate method) with a WebContents for which URLRequests are to be
 //    intercepted,
-// 2) the ResourceThrottle obtained via CreateThrottleFor must be associated
-//    with the URLRequests in the ResourceDispatcherHostDelegate
-//    implementation.
+// 2) the NavigationThrottle obtained via CreateThrottleFor must be associated
+//    with the NavigationHandle in the ContentBrowserClient implementation.
 class InterceptNavigationDelegate : public base::SupportsUserData::Data {
  public:
   InterceptNavigationDelegate(JNIEnv* env, jobject jdelegate);
@@ -50,10 +50,11 @@ class InterceptNavigationDelegate : public base::SupportsUserData::Data {
   // can be null.
   static InterceptNavigationDelegate* Get(content::WebContents* web_contents);
 
-  // Creates a InterceptNavigationResourceThrottle that will direct all
-  // callbacks to the InterceptNavigationDelegate.
-  static content::ResourceThrottle* CreateThrottleFor(
-      net::URLRequest* request);
+  // Creates a InterceptNavigationThrottle that will direct all callbacks to
+  // the InterceptNavigationDelegate.
+  static content::NavigationThrottle* CreateThrottleFor(
+      content::NavigationHandle* handle,

[nasko, 2015/09/04 23:36:49]

I wonder if it will be useful to just expose a way to get the WebContents from
NavigationHandle. No real reason to pass both, as they have 1:1 correspondence.

[clamy, 2015/09/08 16:27:18]

Done.

+      content::WebContents* web_contents);
 
   // Updates information to determine whether to have user gesture carryover or
   // not.