Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 48ee5e3d74962a6fe05623ca8d7f2ae0be3f8108..e91d1d2a1c5d893fed3cedc27180ac49887a877d 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1348,12 +1348,11 @@ bool ChromeContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
 }
 
 bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect(
-    content::BrowserContext* browser_context,
-    const GURL& current_url,
+    content::ResourceContext* resource_context, const GURL& current_url,
     const GURL& new_url) {
 #if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::
-      ShouldSwapProcessesForRedirect(browser_context, current_url, new_url);
+      ShouldSwapProcessesForRedirect(resource_context, current_url, new_url);
 #else
   return false;
 #endif