Refactor away most of ExtensionRendererInfo

chrome/renderer/render_thread.h

Index: chrome/renderer/render_thread.h
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 6817cfb62b6e0f51f8134db100f55a0db191fae5..529af0f21a3c008975c45fd39e4de0877a62f157 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -17,6 +17,7 @@
 #include "chrome/common/child_thread.h"
 #include "chrome/common/css_colors.h"
 #include "chrome/common/gpu_info.h"
+#include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "gfx/native_widget_types.h"
 #include "ipc/ipc_channel_proxy.h"
@@ -43,7 +44,7 @@ class WebDatabaseObserverImpl;
 struct ContentSettings;
 struct RendererPreferences;
 struct DOMStorageMsg_Event_Params;
-struct ViewMsg_ExtensionsUpdated_Params;
+struct ViewMsg_ExtensionLoaded_Params;
 struct ViewMsg_New_Params;
 struct WebPreferences;
 
@@ -201,6 +202,8 @@ class RenderThread : public RenderThreadBase,
 
   bool plugin_refresh_allowed() const { return plugin_refresh_allowed_; }
 
+  ExtensionRendererInfo* extensions() { return &extensions_; }
+
   // Do DNS prefetch resolution of a hostname.
   void Resolve(const char* name, size_t length);
 
@@ -266,8 +269,8 @@ class RenderThread : public RenderThreadBase,
       const GURL& url, const ContentSettings& content_settings);
   void OnUpdateUserScripts(base::SharedMemoryHandle table);
   void OnSetExtensionFunctionNames(const std::vector<std::string>& names);
-  void OnExtensionsUpdated(
-      const ViewMsg_ExtensionsUpdated_Params& params);
+  void OnExtensionLoaded(const ViewMsg_ExtensionLoaded_Params& params);
+  void OnExtensionUnloaded(const std::string& id);
   void OnPageActionsUpdated(const std::string& extension_id,
       const std::vector<std::string>& page_actions);
   void OnDOMStorageEvent(const DOMStorageMsg_Event_Params& params);
@@ -410,6 +413,9 @@ class RenderThread : public RenderThreadBase,
   // contexts.
   std::map<std::string, bool> v8_extensions_;
 
+  // Contains all loaded extensions.
+  ExtensionRendererInfo extensions_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderThread);
 };