Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/renderer/script_context_set.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_CONTEXT_SET_H_
 #define EXTENSIONS_RENDERER_SCRIPT_CONTEXT_SET_H_
 
 #include <set>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/extension_set.h"
 #include "extensions/common/features/feature.h"
+#include "extensions/renderer/renderer_extension_registry.h"
 #include "url/gurl.h"
 #include "v8/include/v8.h"
 
 class GURL;
 
 namespace base {
 class ListValue;
 }
 
 namespace blink {
@@ skipping 10 matching lines @@
 
 // A container of ScriptContexts, responsible for both creating and managing
 // them.
 //
 // Since calling JavaScript within a context can cause any number of contexts
 // to be created or destroyed, this has additional smarts to help with the set
 // changing underneath callers.
 class ScriptContextSet {
  public:
   ScriptContextSet(
-      ExtensionSet* extensions,
       // Set of the IDs of extensions that are active in this process.
       // Must outlive this. TODO(kalman): Combine this and |extensions|.
       ExtensionIdSet* active_extension_ids);
 
   ~ScriptContextSet();
 
   // Returns the number of contexts being tracked by this set.
   // This may also include invalid contexts. TODO(kalman): Useful?
   size_t size() const { return contexts_.size(); }
 
@@ skipping 66 matching lines @@
       const Extension* extension,
       int extension_group,
       const GURL& url,
       const blink::WebSecurityOrigin& origin);
 
   // Calls Remove on |context| then appends |context| to |out|.
   // This is a helper designed to be used by OnExtensionUnloaded with ForEach.
   void DispatchOnUnloadEventAndRemove(std::set<ScriptContext*>* out,
                                       ScriptContext* context);
 
-  // Weak reference to all installed Extensions.
-  ExtensionSet* extensions_;
-
   // Weak reference to all installed Extensions that are also active in this
   // process.
   ExtensionIdSet* active_extension_ids_;
 
   // The set of all ScriptContexts we own.
   std::set<ScriptContext*> contexts_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptContextSet);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_SCRIPT_CONTEXT_SET_H_