Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/renderer/script_injection_manager.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_
 #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/shared_memory.h"
 #include "base/scoped_observer.h"
 #include "extensions/common/user_script.h"
 #include "extensions/renderer/script_injection.h"
 #include "extensions/renderer/user_script_set_manager.h"
 
 struct ExtensionMsg_ExecuteCode_Params;
 
 namespace content {
 class RenderFrame;
 }
 
 namespace extensions {
 class Extension;
-class ExtensionSet;
 
 // The ScriptInjectionManager manages extensions injecting scripts into frames
 // via both content/user scripts and tabs.executeScript(). It is responsible for
 // maintaining any pending injections awaiting permission or the appropriate
 // load point, and injecting them when ready.
 class ScriptInjectionManager : public UserScriptSetManager::Observer {
  public:
-  ScriptInjectionManager(const ExtensionSet* extensions,
-                         UserScriptSetManager* user_script_set_manager);
+  ScriptInjectionManager(UserScriptSetManager* user_script_set_manager);

[Devlin, 2015/08/18 15:40:55]

explicit

[annekao, 2015/08/18 17:43:31]

Done.

   virtual ~ScriptInjectionManager();
 
   // Notifies that a new render view has been created.
   void OnRenderFrameCreated(content::RenderFrame* render_frame);
 
   // Removes pending injections of the unloaded extension.
   void OnExtensionUnloaded(const std::string& extension_id);
 
  private:
   // A RenderFrameObserver implementation which watches the various render
@@ skipping 37 matching lines @@
   // Handle the ExecuteDeclarativeScript extension message.
   void HandleExecuteDeclarativeScript(content::RenderFrame* web_frame,
                                       int tab_id,
                                       const ExtensionId& extension_id,
                                       int script_id,
                                       const GURL& url);
 
   // Handle the GrantInjectionPermission extension message.
   void HandlePermitScriptInjection(int64 request_id);
 
-  // Extensions metadata, owned by Dispatcher (which owns this object).
-  const ExtensionSet* extensions_;
-
   // The map of active web frames to their corresponding statuses. The
   // RunLocation of the frame corresponds to the last location that has ran.
   FrameStatusMap frame_statuses_;
 
   // The frames currently being injected into, so long as that frame is valid.
   std::set<content::RenderFrame*> active_injection_frames_;
 
   // The collection of RFOHelpers.
   ScopedVector<RFOHelper> rfo_helpers_;
 
   // The set of UserScripts associated with extensions. Owned by the Dispatcher.
   UserScriptSetManager* user_script_set_manager_;
 
   // Pending injections which are waiting for either the proper run location or
   // user consent.
   ScopedVector<ScriptInjection> pending_injections_;
 
   // Running injections which are waiting for async callbacks from blink.
   ScopedVector<ScriptInjection> running_injections_;
 
   ScopedObserver<UserScriptSetManager, UserScriptSetManager::Observer>
       user_script_set_manager_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptInjectionManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_