Add a NavigationThrottle to the public content/ interface

components/navigation_interception/intercept_navigation_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
 #define COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/supports_user_data.h"
 
 class GURL;
 
 namespace content {
-class ResourceThrottle;
+class NavigationHandle;
+class NavigationThrottle;
 class WebContents;
 }
 
 namespace net {
 class URLRequest;
 }
 
 namespace navigation_interception {
 
 class NavigationParams;
 
 // Native side of the InterceptNavigationDelegate Java interface.
 // This is used to create a InterceptNavigationResourceThrottle that calls the
 // Java interface method to determine whether a navigation should be ignored or
 // not.
 // To us this class:
 // 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);
   ~InterceptNavigationDelegate() override;
 
   // Associates the InterceptNavigationDelegate with a WebContents using the
   // SupportsUserData mechanism.
   // As implied by the use of scoped_ptr, the WebContents will assume ownership
   // of |delegate|.
   static void Associate(content::WebContents* web_contents,
                         scoped_ptr<InterceptNavigationDelegate> delegate);
   // Gets the InterceptNavigationDelegate associated with the WebContents,
   // 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.
   static void UpdateUserGestureCarryoverInfo(net::URLRequest* request);
 
   virtual bool ShouldIgnoreNavigation(
       const NavigationParams& navigation_params);
 
   // Updates |last_user_gesture_carryover_timestamp_| when user gesture is
   // carried over.
   void UpdateLastUserGestureCarryoverTimestamp();
 
  private:
   JavaObjectWeakGlobalRef weak_jdelegate_;
   base::TimeTicks last_user_gesture_carryover_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(InterceptNavigationDelegate);
 };
 
 bool RegisterInterceptNavigationDelegate(JNIEnv* env);
 
 }  // namespace navigation_interception
 
 #endif  // COMPONENTS_NAVIGATION_INTERCEPTION_INTERCEPT_NAVIGATION_DELEGATE_H_