Create thread-safe RendererExtensionRegistry from ExtensionSet

chrome/renderer/extensions/app_bindings.cc

 // Copyright (c) 2012 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/renderer/extensions/app_bindings.h"
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #include "extensions/renderer/console.h"
 #include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/extension_helper.h"
+#include "extensions/renderer/renderer_extension_registry.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "v8/include/v8.h"
 
 using blink::WebFrame;
 using content::V8ValueConverter;
 
 namespace extensions {
 
@@ skipping 35 matching lines @@
   CHECK(web_frame);
   args.GetReturnValue().Set(GetDetailsImpl(web_frame));
 }
 
 v8::Local<v8::Value> AppBindings::GetDetailsImpl(blink::WebLocalFrame* frame) {
   v8::Isolate* isolate = frame->mainWorldScriptContext()->GetIsolate();
   if (frame->document().securityOrigin().isUnique())
     return v8::Null(isolate);
 
   const Extension* extension =
-      dispatcher_->extensions()->GetExtensionOrAppByURL(
+      RendererExtensionRegistry::Get()->GetExtensionOrAppByURL(
           frame->document().url());
 
   if (!extension)
     return v8::Null(isolate);
 
   scoped_ptr<base::DictionaryValue> manifest_copy(
       extension->manifest()->value()->DeepCopy());
   manifest_copy->SetString("id", extension->id());
   scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
   return converter->ToV8Value(manifest_copy.get(),
@@ skipping 20 matching lines @@
       render_frame->GetRoutingID(), context()->web_frame()->document().url(),
       GetRoutingID(), callback_id));
 }
 
 void AppBindings::GetRunningState(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   // To distinguish between ready_to_run and cannot_run states, we need the app
   // from the top frame.
   blink::WebSecurityOrigin top_frame_security_origin =
       context()->web_frame()->top()->securityOrigin();
-  const ExtensionSet* extensions = dispatcher_->extensions();
+  const RendererExtensionRegistry* extensions =
+      RendererExtensionRegistry::Get();
 
   // The app associated with the top level frame.
   const Extension* top_app = extensions->GetHostedAppByURL(
       GURL(top_frame_security_origin.toString().utf8()));
 
   // The app associated with this frame.
   const Extension* this_app = extensions->GetHostedAppByURL(
       context()->web_frame()->document().url());
 
   if (!this_app || !top_app) {
@@ skipping 34 matching lines @@
   v8::Context::Scope context_scope(context()->v8_context());
   v8::Local<v8::Value> argv[] = {
     v8::String::NewFromUtf8(isolate, state.c_str()),
     v8::Integer::New(isolate, callback_id)
   };
   context()->module_system()->CallModuleMethod(
       "app", "onInstallStateResponse", arraysize(argv), argv);
 }
 
 }  // namespace extensions