Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/renderer/extension_injection_host.cc

 // Copyright 2015 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 "extensions/renderer/extension_injection_host.h"
 
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/constants.h"
-#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/csp_info.h"
+#include "extensions/renderer/renderer_extension_registry.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace extensions {
 
 ExtensionInjectionHost::ExtensionInjectionHost(
     const Extension* extension)
     : InjectionHost(HostID(HostID::EXTENSIONS, extension->id())),
       extension_(extension) {
 }
 
 ExtensionInjectionHost::~ExtensionInjectionHost() {
 }
 
 // static
 scoped_ptr<const InjectionHost> ExtensionInjectionHost::Create(
-    const std::string& extension_id,
-    const ExtensionSet* extensions) {
-  const Extension* extension = extensions->GetByID(extension_id);
+    const std::string& extension_id) {
+  const Extension* extension =
+      RendererExtensionRegistry::Get()->GetByID(extension_id);
   if (!extension)
     return scoped_ptr<const ExtensionInjectionHost>();
   return scoped_ptr<const ExtensionInjectionHost>(
       new ExtensionInjectionHost(extension));
 }
 
 std::string ExtensionInjectionHost::GetContentSecurityPolicy() const {
   return CSPInfo::GetContentSecurityPolicy(extension_);
 }
 
@@ skipping 45 matching lines @@
   // We notify the browser of any injection if the extension has no withheld
   // permissions (i.e., the permissions weren't restricted), but would have
   // otherwise been affected by the scripts-require-action feature.
   return extension_->permissions_data()->withheld_permissions()->IsEmpty() &&
          PermissionsData::ScriptsMayRequireActionForExtension(
              extension_,
              extension_->permissions_data()->active_permissions().get());
 }
 
 }  // namespace extensions