Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/renderer/user_script_set.h

Index: extensions/renderer/user_script_set.h
diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h
index a39a543bc3789fb30f54599f2129596055c50def..bad0e035e060def3b4a9aa801675e5e03734013c 100644
--- a/extensions/renderer/user_script_set.h
+++ b/extensions/renderer/user_script_set.h
@@ -24,7 +24,6 @@ class RenderFrame;
 }
 
 namespace extensions {
-class ExtensionSet;
 class ScriptInjection;
 
 // The UserScriptSet is a collection of UserScripts which knows how to update
@@ -39,7 +38,7 @@ class UserScriptSet {
         const std::vector<UserScript*>& scripts) = 0;
   };
 
-  explicit UserScriptSet(const ExtensionSet* extensions);
+  explicit UserScriptSet();

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

not explicit

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

Done.

   ~UserScriptSet();
 
   // Adds or removes observers.
@@ -87,9 +86,6 @@ class UserScriptSet {
   // Shared memory containing raw script data.
   scoped_ptr<base::SharedMemory> shared_memory_;
 
-  // The set of all known extensions. Owned by the Dispatcher.
-  const ExtensionSet* extensions_;
-
   // The UserScripts this injector manages.
   ScopedVector<UserScript> scripts_;