Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/renderer/dispatcher.h

Index: extensions/renderer/dispatcher.h
diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h
index 4f5a132e1b97da513aaf3939611a1884e3cb693f..81478e71e7306f40b00f7a7679f9652e39a69545 100644
--- a/extensions/renderer/dispatcher.h
+++ b/extensions/renderer/dispatcher.h
@@ -17,7 +17,6 @@
 #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"
@@ -74,8 +73,6 @@ class Dispatcher : public content::RenderProcessObserver,
     return function_names_;
   }
 
-  const ExtensionSet* extensions() const { return &extensions_; }
-
   const ScriptContextSet& script_context_set() const {
     return *script_context_set_;
   }
@@ -138,17 +135,11 @@ class Dispatcher : public content::RenderProcessObserver,
 
  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;
@@ -261,11 +252,6 @@ class Dispatcher : public content::RenderProcessObserver,
   // 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_;