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..ca0879d192fed96008233ff83eb019cbf965ead5 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -456,12 +456,11 @@ 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(),
+      ExtensionRegistry::Get(browser_context)->enabled_extensions(),

[nasko, 2016/09/08 00:35:36]

Does io_data->GetExtensionInfoMap()->extensions() only include enabled
extensions? I just want to make sure those are equivalent, since there are other
types in ExtensionRegistry.

[clamy, 2016/09/09 15:06:41]

I think so? I was planning on getting someone from the extension team to review
this part so I can get it right. It's not very clear from the code what's in the
extension map. In the meantime I've replaced it with the set of installed
extensions.

[nasko, 2016/09/09 23:30:27]

I poked Devlin and his response was that only enabled_extensions() would be in
the map of the IO thread. 

[clamy, 2016/09/12 15:31:37]

Ok. Went back to that.

       current_url, new_url, false);
 }