Create thread-safe RendererExtensionRegistry from ExtensionSet

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index cfb68bf1308749ea7256b5468f71e29d27643311..4f4cddde7b9af291ff69b9f97f90008a87d80a39 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -126,6 +126,7 @@
 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
 #include "extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h"
 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
+#include "extensions/renderer/renderer_extension_registry.h"
 #include "extensions/renderer/script_context.h"
 #endif
 
@@ -616,7 +617,8 @@ const Extension* ChromeContentRendererClient::GetExtensionByOrigin(
     return NULL;
 
   const std::string extension_id = origin.host().utf8().data();
-  return extension_dispatcher_->extensions()->GetByID(extension_id);
+  return extensions::RendererExtensionRegistry::GetRegistry()->GetByID(
+      extension_id);
 }
 #endif
 
@@ -811,8 +813,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
             app_url = manifest_url;
           }
           const Extension* extension =
-              g_current_client->extension_dispatcher_->extensions()->
-                  GetExtensionOrAppByURL(manifest_url);
+              extensions::RendererExtensionRegistry::GetRegistry()
+                  ->GetExtensionOrAppByURL(manifest_url);
           if (!IsNaClAllowed(manifest_url,
                              app_url,
                              is_nacl_unrestricted,
@@ -1235,7 +1237,8 @@ bool ChromeContentRendererClient::ShouldFork(blink::WebLocalFrame* frame,
 
 #if defined(ENABLE_EXTENSIONS)
   const extensions::ExtensionSet* extensions =
-      extension_dispatcher_->extensions();
+      extensions::RendererExtensionRegistry::GetRegistry()
+          ->GetMainThreadExtensionSet();
 
   // Determine if the new URL is an extension (excluding bookmark apps).
   const Extension* new_url_extension = extensions::GetNonBookmarkAppExtension(
@@ -1256,7 +1259,8 @@ bool ChromeContentRendererClient::ShouldFork(blink::WebLocalFrame* frame,
     *send_referrer = true;
 
     const Extension* extension =
-        extension_dispatcher_->extensions()->GetExtensionOrAppByURL(url);
+        extensions::RendererExtensionRegistry::GetRegistry()
+            ->GetExtensionOrAppByURL(url);
     if (extension && extension->is_app()) {
       extensions::RecordAppLaunchType(
           extension_misc::APP_LAUNCH_CONTENT_NAVIGATION, extension->GetType());
@@ -1291,10 +1295,9 @@ bool ChromeContentRendererClient::WillSendRequest(
 #if defined(ENABLE_EXTENSIONS)
   if (url.SchemeIs(extensions::kExtensionScheme) &&
       !extensions::ResourceRequestPolicy::CanRequestResource(
-          url,
-          frame,
-          transition_type,
-          extension_dispatcher_->extensions())) {
+          url, frame, transition_type,
+          extensions::RendererExtensionRegistry::GetRegistry()
+              ->GetMainThreadExtensionSet())) {
     *new_url = GURL(chrome::kExtensionInvalidRequestURL);
     return true;
   }
@@ -1464,7 +1467,8 @@ bool ChromeContentRendererClient::IsExternalPepperPlugin(
 bool ChromeContentRendererClient::IsExtensionOrSharedModuleWhitelisted(
     const GURL& url, const std::set<std::string>& whitelist) {
   const extensions::ExtensionSet* extension_set =
-      g_current_client->extension_dispatcher_->extensions();
+      extensions::RendererExtensionRegistry::GetRegistry()
+          ->GetMainThreadExtensionSet();
   return chrome::IsExtensionOrSharedModuleWhitelisted(url, extension_set,
       whitelist);
 }