Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/renderer/dispatcher.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_DISPATCHER_H_
 #define EXTENSIONS_RENDERER_DISPATCHER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/timer/timer.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "extensions/common/event_filter.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/extension_set.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/renderer/resource_bundle_source_map.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_context_set.h"
 #include "extensions/renderer/user_script_set_manager.h"
 #include "extensions/renderer/v8_schema_registry.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "v8/include/v8.h"
@@ skipping 36 matching lines @@
 class Dispatcher : public content::RenderProcessObserver,
                    public UserScriptSetManager::Observer {
  public:
   explicit Dispatcher(DispatcherDelegate* delegate);
   ~Dispatcher() override;
 
   const std::set<std::string>& function_names() const {
     return function_names_;
   }
 
-  const ExtensionSet* extensions() const { return &extensions_; }
-
   const ScriptContextSet& script_context_set() const {
     return *script_context_set_;
   }
 
   V8SchemaRegistry* v8_schema_registry() { return v8_schema_registry_.get(); }
 
   ContentWatcher* content_watcher() { return content_watcher_.get(); }
 
   RequestSender* request_sender() { return request_sender_.get(); }
 
@@ skipping 42 matching lines @@
   static void RegisterNativeHandlers(ModuleSystem* module_system,
                                      ScriptContext* context,
                                      Dispatcher* dispatcher,
                                      RequestSender* request_sender,
                                      V8SchemaRegistry* v8_schema_registry);
 
   bool WasWebRequestUsedBySomeExtensions() const { return webrequest_used_; }
 
  private:
   // The RendererPermissionsPolicyDelegateTest.CannotScriptWebstore test needs
-  // to call LoadExtensionForTest and the OnActivateExtension IPCs.
+  // to call the OnActivateExtension IPCs.
   friend class ::ChromeRenderViewTest;
   FRIEND_TEST_ALL_PREFIXES(RendererPermissionsPolicyDelegateTest,
                            CannotScriptWebstore);
 
-  // Inserts an Extension into |extensions_|. Normally the only way to do this
-  // would be through the ExtensionMsg_Loaded IPC (OnLoaded) but this can't be
-  // triggered for tests, because in the process of serializing then
-  // deserializing the IPC, Extension IDs manually set for testing are lost.
-  void LoadExtensionForTest(const Extension* extension);
-
   // RenderProcessObserver implementation:
   bool OnControlMessageReceived(const IPC::Message& message) override;
   void WebKitInitialized() override;
   void IdleNotification() override;
   void OnRenderProcessShutdown() override;
 
   void OnActivateExtension(const std::string& extension_id);
   void OnCancelSuspend(const std::string& extension_id);
   void OnDeliverMessage(int target_port_id, const Message& message);
   void OnDispatchOnConnect(int target_port_id,
@@ skipping 92 matching lines @@
   // Adds features that are specific to the current channel.
   void AddChannelSpecificFeatures();
 
   // The delegate for this dispatcher. Not owned, but must extend beyond the
   // Dispatcher's own lifetime.
   DispatcherDelegate* delegate_;
 
   // True if the IdleNotification timer should be set.
   bool set_idle_notifications_;
 
-  // Contains all loaded extensions.  This is essentially the renderer
-  // counterpart to ExtensionService in the browser. It contains information
-  // about all extensions currently loaded by the browser.
-  ExtensionSet extensions_;
-
   // The IDs of extensions that failed to load, mapped to the error message
   // generated on failure.
   std::map<std::string, std::string> extension_load_errors_;
 
   // All the bindings contexts that are currently loaded for this renderer.
   // There is zero or one for each v8 context.
   scoped_ptr<ScriptContextSet> script_context_set_;
 
   scoped_ptr<ContentWatcher> content_watcher_;
 
@@ skipping 36 matching lines @@
 
   // Status of webrequest usage.
   bool webrequest_used_;
 
   DISALLOW_COPY_AND_ASSIGN(Dispatcher);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_DISPATCHER_H_