Merge CrossSiteResourceHandler and NavigationResourceThrottle

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 438 matching lines @@
           new_extension->id(), site_instance->GetProcess()->GetID()))
     return true;
 
   // Otherwise, swap BrowsingInstances if current_extension and new_extension
   // differ.
   return current_extension != new_extension;
 }
 
 // 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);
 }
 
 // static
 bool ChromeContentBrowserClientExtensionsPart::AllowServiceWorker(
     const GURL& scope,
     const GURL& first_party_url,
     content::ResourceContext* context,
     int render_process_id,
     int render_frame_id) {
@@ skipping 211 matching lines @@
     }
   }
 }
 
 void ChromeContentBrowserClientExtensionsPart::ResourceDispatcherHostCreated() {
   content::ResourceDispatcherHost::Get()->RegisterInterceptor(
       "Origin", kExtensionScheme, base::Bind(&OnHttpHeaderReceived));
 }
 
 }  // namespace extensions