Add a NavigationThrottle to the public content/ interface

components/navigation_interception/intercept_navigation_delegate.cc

 // 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.
 
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
-#include "components/navigation_interception/intercept_navigation_resource_throttle.h"
+#include "components/navigation_interception/intercept_navigation_throttle.h"
 #include "components/navigation_interception/navigation_params_android.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/InterceptNavigationDelegate_jni.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
@@ skipping 53 matching lines @@
 }
 
 // static
 InterceptNavigationDelegate* InterceptNavigationDelegate::Get(
     WebContents* web_contents) {
   return static_cast<InterceptNavigationDelegate*>(
       web_contents->GetUserData(kInterceptNavigationDelegateUserDataKey));
 }
 
 // static
-content::ResourceThrottle* InterceptNavigationDelegate::CreateThrottleFor(
-    net::URLRequest* request) {
-  return new InterceptNavigationResourceThrottle(
-      request, base::Bind(&CheckIfShouldIgnoreNavigationOnUIThread));
+scoped_ptr<content::NavigationThrottle>
+InterceptNavigationDelegate::CreateThrottleFor(
+    content::NavigationHandle* handle,
+    content::WebContents* web_contents) {
+  return scoped_ptr<InterceptNavigationThrottle>(

[davidben, 2015/09/01 21:55:17]

Optional: This can be

  return make_scoped_ptr(new InterceptNavigationThrottle(...));

[clamy, 2015/09/03 15:30:51]

Due to a change in the interface for registering throttles, it now returns a raw
pointer.

+      new InterceptNavigationThrottle(
+          handle, web_contents,
+          base::Bind(&CheckIfShouldIgnoreNavigationOnUIThread)));
 }
 
 // static
 void InterceptNavigationDelegate::UpdateUserGestureCarryoverInfo(
     net::URLRequest* request) {
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
   if (!info || !info->HasUserGesture())
     return;
 
@@ skipping 44 matching lines @@
   last_user_gesture_carryover_timestamp_ = base::TimeTicks::Now();
 }
 
 // Register native methods.
 
 bool RegisterInterceptNavigationDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace navigation_interception