Merge 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 580f29310c20e9769db81c6aaba664d84e692c65..596313204e261531866889d08425c3560c852295 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1317,11 +1317,12 @@ bool ChromeContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
 }
 
 bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect(
-    content::ResourceContext* resource_context, const GURL& current_url,
+    content::BrowserContext* browser_context,
+    const GURL& current_url,
     const GURL& new_url) {
 #if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::
-      ShouldSwapProcessesForRedirect(resource_context, current_url, new_url);
+      ShouldSwapProcessesForRedirect(browser_context, current_url, new_url);
 #else
   return false;
 #endif