Merge CrossSiteResourceHandler and NavigationResourceThrottle

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

Index: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
index b53243a6b772eeb6cfdda91ce428ab52699dc795..5633891e835409c76106d4578ff6690116a6ab32 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -456,13 +456,13 @@ bool ChromeContentBrowserClientExtensionsPart::
 
 // static
 bool ChromeContentBrowserClientExtensionsPart::ShouldSwapProcessesForRedirect(
-    content::ResourceContext* resource_context,
+    content::BrowserContext* browser_context,
     const GURL& current_url,
     const GURL& new_url) {
-  ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
-  return CrossesExtensionProcessBoundary(
-      io_data->GetExtensionInfoMap()->extensions(),
-      current_url, new_url, false);
+  std::unique_ptr<ExtensionSet> installed_extensions =
+      ExtensionRegistry::Get(browser_context)->GenerateInstalledExtensionsSet();
+  return CrossesExtensionProcessBoundary(*installed_extensions, current_url,
+                                         new_url, false);
 }
 
 // static