Reland of Add a NavigationThrottle to the public content/ interface

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index aa4705e9c628f7ffdb6ba3162844bff8c2f5fb87..b28332ea3809ee058b9b810f1b6d44be397b5319 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -339,25 +339,8 @@
       resource_context);
 
 #if defined(OS_ANDROID)
-  // TODO(davidben): This is insufficient to integrate with prerender properly.
-  // https://crbug.com/370595
-  if (!is_prerendering) {
-    if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) {
-      throttles->push_back(
-          InterceptNavigationDelegate::CreateThrottleFor(request));
-    } else {
-      InterceptNavigationDelegate::UpdateUserGestureCarryoverInfo(request);
-    }
-  }
-#else
-  if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) {
-    // Redirect some navigations to apps that have registered matching URL
-    // handlers ('url_handlers' in the manifest).
-    content::ResourceThrottle* url_to_app_throttle =
-        AppUrlRedirector::MaybeCreateThrottleFor(request, io_data);
-    if (url_to_app_throttle)
-      throttles->push_back(url_to_app_throttle);
-  }
+  if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME)
+    InterceptNavigationDelegate::UpdateUserGestureCarryoverInfo(request);
 #endif
 
 #if defined(OS_CHROMEOS)