Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/renderer/user_script_set.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 "extensions/renderer/user_script_set.h"
 
 #include "base/memory/ref_counted.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/extension_set.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/renderer/extension_injection_host.h"
 #include "extensions/renderer/extensions_renderer_client.h"
 #include "extensions/renderer/injection_host.h"
+#include "extensions/renderer/renderer_extension_registry.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_injection.h"
 #include "extensions/renderer/user_script_injector.h"
 #include "extensions/renderer/web_ui_injection_host.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 GURL GetDocumentUrlForFrame(blink::WebLocalFrame* frame) {
   GURL data_source_url = ScriptContext::GetDataSourceURLForFrame(frame);
   if (!data_source_url.is_empty() && frame->isViewSourceModeEnabled()) {
     data_source_url = GURL(content::kViewSourceScheme + std::string(":") +
                            data_source_url.spec());
   }
 
   return data_source_url;
 }
 
 }  // namespace
 
-UserScriptSet::UserScriptSet(const ExtensionSet* extensions)
-    : extensions_(extensions) {
-}
+UserScriptSet::UserScriptSet() {}
 
 UserScriptSet::~UserScriptSet() {
 }
 
 void UserScriptSet::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void UserScriptSet::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 78 matching lines @@
       const char* body = NULL;
       int body_length = 0;
       CHECK(iter.ReadData(&body, &body_length));
       script->css_scripts()[j].set_external_content(
           base::StringPiece(body, body_length));
     }
 
     if (only_inject_incognito && !script->is_incognito_enabled())
       continue;  // This script shouldn't run in an incognito tab.
 
-    const Extension* extension = extensions_->GetByID(script->extension_id());
+    const Extension* extension =
+        RendererExtensionRegistry::Get()->GetByID(script->extension_id());
     if (whitelisted_only &&
         (!extension ||
          !PermissionsData::CanExecuteScriptEverywhere(extension))) {
       continue;
     }
 
     scripts_.push_back(script.Pass());
   }
 
   FOR_EACH_OBSERVER(Observer,
@@ skipping 27 matching lines @@
     int tab_id,
     UserScript::RunLocation run_location,
     const GURL& document_url,
     bool is_declarative) {
   scoped_ptr<ScriptInjection> injection;
   scoped_ptr<const InjectionHost> injection_host;
   blink::WebLocalFrame* web_frame = render_frame->GetWebFrame();
 
   const HostID& host_id = script->host_id();
   if (host_id.type() == HostID::EXTENSIONS) {
-    injection_host = ExtensionInjectionHost::Create(host_id.id(), extensions_);
+    injection_host = ExtensionInjectionHost::Create(host_id.id());
     if (!injection_host)
       return injection.Pass();
   } else {
     DCHECK_EQ(host_id.type(), HostID::WEBUI);
     injection_host.reset(new WebUIInjectionHost(host_id));
   }
 
   if (web_frame->parent() && !script->match_all_frames())
     return injection.Pass();  // Only match subframes if the script declared it.
 
@@ skipping 24 matching lines @@
         injector.Pass(),
         render_frame,
         injection_host.Pass(),
         run_location,
         tab_id));
   }
   return injection.Pass();
 }
 
 }  // namespace extensions