Move ExtensionRendereInfo into common and call it ExtensionSet instead.

BUG=
TEST=

Review URL: http://codereview.chromium.org/6383013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73055 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 76 insertions, 69 deletions

diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 7c3ddd2..8d060a0 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -521,6 +521,7 @@ class ExtensionService
   ExtensionPrefs* extension_prefs_;
 
   // The current list of installed extensions.
+  // TODO(aa): This should use chrome/common/extensions/extension_set.h.
   ExtensionList extensions_;
 
   // The list of installed extensions that have been disabled.
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 40e1341..f65f63c 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -181,6 +181,7 @@ class ChromeURLRequestContext : public net::URLRequestContext {
   scoped_refptr<HostZoomMap> host_zoom_map_;
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
+  // TODO(aa): This should use chrome/common/extensions/extension_set.h.
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
   scoped_refptr<PrerenderManager> prerender_manager_;
 
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 02833d9..cb8bc1d 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -282,6 +282,8 @@
         'common/extensions/extension_message_bundle.h',
         'common/extensions/extension_resource.cc',
         'common/extensions/extension_resource.h',
+        'common/extensions/extension_set.cc',
+        'common/extensions/extension_set.h',
         'common/extensions/extension_sidebar_defaults.h',
         'common/extensions/extension_sidebar_utils.cc',
         'common/extensions/extension_sidebar_utils.h',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 5c1dbef..f5d9cb6 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -56,8 +56,6 @@
         'renderer/extensions/bindings_utils.h',
         'renderer/extensions/chrome_app_bindings.cc',
         'renderer/extensions/chrome_app_bindings.h',
-        'renderer/extensions/extension_renderer_info.cc',
-        'renderer/extensions/extension_renderer_info.h',
         'renderer/extensions/event_bindings.cc',
         'renderer/extensions/event_bindings.h',
         'renderer/extensions/extension_process_bindings.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0dde86b..684a48b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1643,6 +1643,7 @@
         'common/extensions/extension_message_bundle_unittest.cc',
         'common/extensions/extension_resource_unittest.cc',
         'common/extensions/extension_unittest.cc',
+        'common/extensions/extension_set_unittest.cc',
         'common/extensions/extension_unpacker_unittest.cc',
         'common/extensions/update_manifest_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
@@ -1687,7 +1688,6 @@
         'gpu/gpu_video_decoder_unittest.cc',
         'renderer/audio_message_filter_unittest.cc',
         'renderer/extensions/extension_api_json_validity_unittest.cc',
-        'renderer/extensions/extension_renderer_info_unittest.cc',
         'renderer/extensions/json_schema_unittest.cc',
         'renderer/gpu_video_decoder_host_unittest.cc',
         'renderer/media/audio_renderer_impl_unittest.cc',
diff --git a/chrome/renderer/extensions/extension_renderer_info.cc b/chrome/common/extensions/extension_set.cc
index 5cc2dc8..fcf96e6 100644
--- a/chrome/renderer/extensions/extension_renderer_info.cc
+++ b/chrome/common/extensions/extension_set.cc
@@ -1,32 +1,35 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#include "chrome/renderer/extensions/extension_renderer_info.h"
+#include "chrome/common/extensions/extension_set.h"
 
 #include "base/logging.h"
 #include "chrome/common/url_constants.h"
 
-ExtensionRendererInfo::ExtensionRendererInfo() {
+ExtensionSet::ExtensionSet() {
 }
 
-ExtensionRendererInfo::~ExtensionRendererInfo() {
+ExtensionSet::~ExtensionSet() {
 }
 
-size_t ExtensionRendererInfo::size() const {
+size_t ExtensionSet::size() const {
   return extensions_.size();
 }
 
-void ExtensionRendererInfo::Update(
-    const scoped_refptr<const Extension>& extension) {
+bool ExtensionSet::Contains(const std::string& extension_id) {
+  return extensions_.find(extension_id) != extensions_.end();
+}
+
+void ExtensionSet::Insert(const scoped_refptr<const Extension>& extension) {
   extensions_[extension->id()] = extension;
 }
 
-void ExtensionRendererInfo::Remove(const std::string& id) {
+void ExtensionSet::Remove(const std::string& id) {
   extensions_.erase(id);
 }
 
-std::string ExtensionRendererInfo::GetIdByURL(const GURL& url) const {
+std::string ExtensionSet::GetIdByURL(const GURL& url) const {
   if (url.SchemeIs(chrome::kExtensionScheme))
     return url.host();
 
@@ -37,8 +40,7 @@ std::string ExtensionRendererInfo::GetIdByURL(const GURL& url) const {
   return extension->id();
 }
 
-const Extension* ExtensionRendererInfo::GetByURL(
-    const GURL& url) const {
+const Extension* ExtensionSet::GetByURL(const GURL& url) const {
   if (url.SchemeIs(chrome::kExtensionScheme))
     return GetByID(url.host());
 
@@ -51,13 +53,12 @@ const Extension* ExtensionRendererInfo::GetByURL(
   return NULL;
 }
 
-bool ExtensionRendererInfo::InSameExtent(const GURL& old_url,
-                                         const GURL& new_url) const {
+bool ExtensionSet::InSameExtent(const GURL& old_url,
+                                const GURL& new_url) const {
   return GetByURL(old_url) == GetByURL(new_url);
 }
 
-const Extension* ExtensionRendererInfo::GetByID(
-    const std::string& id) const {
+const Extension* ExtensionSet::GetByID(const std::string& id) const {
   ExtensionMap::const_iterator i = extensions_.find(id);
   if (i != extensions_.end())
     return i->second.get();
@@ -65,7 +66,7 @@ const Extension* ExtensionRendererInfo::GetByID(
     return NULL;
 }
 
-bool ExtensionRendererInfo::ExtensionBindingsAllowed(const GURL& url) const {
+bool ExtensionSet::ExtensionBindingsAllowed(const GURL& url) const {
   if (url.SchemeIs(chrome::kExtensionScheme))
     return true;
 
diff --git a/chrome/renderer/extensions/extension_renderer_info.h b/chrome/common/extensions/extension_set.h
index efcc436..9d00d1d 100644
--- a/chrome/renderer/extensions/extension_renderer_info.h
+++ b/chrome/common/extensions/extension_set.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 CHROME_RENDERER_EXTENSIONS_EXTENSION_RENDERER_INFO_H_
-#define CHROME_RENDERER_EXTENSIONS_EXTENSION_RENDERER_INFO_H_
+#ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_
+#define CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_
 #pragma once
 
 #include <string>
@@ -14,19 +14,22 @@
 #include "chrome/common/extensions/extension.h"
 #include "googleurl/src/gurl.h"
 
-// ExtensionRendererInfo is a convenience wrapper around a map of extension
-// objects. It is used by renderers to maintain information about currently
-// loaded extensions.
-class ExtensionRendererInfo {
+// The one true extension container. Extensions are identified by their id.
+// Only one extension can be in the set with a given ID.
+class ExtensionSet {
  public:
-  ExtensionRendererInfo();
-  ~ExtensionRendererInfo();
+  ExtensionSet();
+  ~ExtensionSet();
 
   // Gets the number of extensions contained.
   size_t size() const;
 
-  // Updates the specified extension.
-  void Update(const scoped_refptr<const Extension>& extension);
+  // Returns true if the set contains the specified extension.
+  bool Contains(const std::string& id);
+
+  // Adds the specified extension to the set. The set becomes an owner. Any
+  // previous extension with the same ID is removed.
+  void Insert(const scoped_refptr<const Extension>& extension);
 
   // Removes the specified extension.
   void Remove(const std::string& id);
@@ -55,13 +58,13 @@ class ExtensionRendererInfo {
   bool ExtensionBindingsAllowed(const GURL& url) const;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(ExtensionRendererInfoTest, ExtensionRendererInfo);
+  FRIEND_TEST_ALL_PREFIXES(ExtensionSetTest, ExtensionSet);
 
   // static
   typedef std::map<std::string, scoped_refptr<const Extension> > ExtensionMap;
   ExtensionMap extensions_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExtensionRendererInfo);
+  DISALLOW_COPY_AND_ASSIGN(ExtensionSet);
 };
 
-#endif  // CHROME_RENDERER_EXTENSIONS_EXTENSION_RENDERER_INFO_H_
+#endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_
diff --git a/chrome/renderer/extensions/extension_renderer_info_unittest.cc b/chrome/common/extensions/extension_set_unittest.cc
index 7cd41d8..1b85ac5 100644
--- a/chrome/renderer/extensions/extension_renderer_info_unittest.cc
+++ b/chrome/common/extensions/extension_set_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -8,7 +8,7 @@
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -47,7 +47,7 @@ scoped_refptr<Extension> CreateTestExtension(const std::string& name,
 
 } // namespace
 
-TEST(ExtensionRendererInfoTest, ExtensionRendererInfo) {
+TEST(ExtensionSetTest, ExtensionSet) {
   scoped_refptr<Extension> ext1(CreateTestExtension(
       "a", "https://chrome.google.com/launch", "https://chrome.google.com/"));
 
@@ -62,21 +62,21 @@ TEST(ExtensionRendererInfoTest, ExtensionRendererInfo) {
 
   ASSERT_TRUE(ext1 && ext2 && ext3 && ext4);
 
-  ExtensionRendererInfo extensions;
+  ExtensionSet extensions;
 
   // Add an extension.
-  extensions.Update(ext1);
+  extensions.Insert(ext1);
   EXPECT_EQ(1u, extensions.size());
   EXPECT_EQ(ext1, extensions.GetByID(ext1->id()));
 
   // Since extension2 has same ID, it should overwrite extension1.
-  extensions.Update(ext2);
+  extensions.Insert(ext2);
   EXPECT_EQ(1u, extensions.size());
   EXPECT_EQ(ext2, extensions.GetByID(ext1->id()));
 
   // Add the other extensions.
-  extensions.Update(ext3);
-  extensions.Update(ext4);
+  extensions.Insert(ext3);
+  extensions.Insert(ext4);
   EXPECT_EQ(3u, extensions.size());
 
   // Get extension by its chrome-extension:// URL
diff --git a/chrome/renderer/extensions/chrome_app_bindings.cc b/chrome/renderer/extensions/chrome_app_bindings.cc
index 6c42746..b183d98 100644
--- a/chrome/renderer/extensions/chrome_app_bindings.cc
+++ b/chrome/renderer/extensions/chrome_app_bindings.cc
@@ -6,8 +6,8 @@
 
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index 30e7e6f..49f2fea 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -6,12 +6,12 @@
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
@@ -265,7 +265,7 @@ void EventBindings::HandleContextCreated(WebFrame* frame, bool content_script) {
   if (!ds)
     ds = frame->dataSource();
   GURL url = ds->request().url();
-  const ExtensionRendererInfo* extensions = GetRenderThread()->GetExtensions();
+  const ExtensionSet* extensions = GetRenderThread()->GetExtensions();
   std::string extension_id = extensions->GetIdByURL(url);
 
   if (!extensions->ExtensionBindingsAllowed(url) &&
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 39117aa..42c980d 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -16,13 +16,13 @@
 #include "base/string_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/user_script_slave.h"
@@ -212,7 +212,7 @@ class ExtensionImpl : public ExtensionBase {
       return std::string();  // this can happen as a tab is closing.
 
     GURL url = renderview->webview()->mainFrame()->url();
-    const ExtensionRendererInfo* extensions =
+    const ExtensionSet* extensions =
         EventBindings::GetRenderThread()->GetExtensions();
     if (!extensions->ExtensionBindingsAllowed(url))
       return std::string();
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc
index 8821267..7350b34 100644
--- a/chrome/renderer/localized_error.cc
+++ b/chrome/renderer/localized_error.cc
@@ -11,7 +11,7 @@
 #include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/renderer/mock_render_thread.cc b/chrome/renderer/mock_render_thread.cc
index 5dd0e53..3640987 100644
--- a/chrome/renderer/mock_render_thread.cc
+++ b/chrome/renderer/mock_render_thread.cc
@@ -27,7 +27,7 @@ MockRenderThread::MockRenderThread()
 MockRenderThread::~MockRenderThread() {
 }
 
-const ExtensionRendererInfo* MockRenderThread::GetExtensions() const {
+const ExtensionSet* MockRenderThread::GetExtensions() const {
   return &extensions_;
 }
 
diff --git a/chrome/renderer/mock_render_thread.h b/chrome/renderer/mock_render_thread.h
index 551f77a..e711222 100644
--- a/chrome/renderer/mock_render_thread.h
+++ b/chrome/renderer/mock_render_thread.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/renderer/extensions/extension_renderer_info.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/renderer/mock_printer.h"
 #include "chrome/renderer/render_thread.h"
 #include "ipc/ipc_test_sink.h"
@@ -31,7 +31,7 @@ class MockRenderThread : public RenderThreadBase {
   MockRenderThread();
   virtual ~MockRenderThread();
 
-  virtual const ExtensionRendererInfo* GetExtensions() const;
+  virtual const ExtensionSet* GetExtensions() const;
 
   // Provides access to the messages that have been received by this thread.
   IPC::TestSink& sink() { return sink_; }
@@ -144,7 +144,7 @@ class MockRenderThread : public RenderThreadBase {
 
   // Contains extensions currently loaded by browser. This is usually empty
   // for MockRenderThread.
-  ExtensionRendererInfo extensions_;
+  ExtensionSet extensions_;
 
   bool is_extension_process_;
 };
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index fc9243f..2721173 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -29,6 +29,8 @@
 #include "chrome/common/database_messages.h"
 #include "chrome/common/db_message_filter.h"
 #include "chrome/common/dom_storage_messages.h"
+#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
@@ -48,7 +50,6 @@
 #include "chrome/renderer/devtools_agent_filter.h"
 #include "chrome/renderer/extension_groups.h"
 #include "chrome/renderer/extensions/chrome_app_bindings.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
@@ -350,7 +351,7 @@ int32 RenderThread::RoutingIDForCurrentContext() {
   return routing_id;
 }
 
-const ExtensionRendererInfo* RenderThread::GetExtensions() const {
+const ExtensionSet* RenderThread::GetExtensions() const {
   return &extensions_;
 }
 
@@ -551,7 +552,7 @@ void RenderThread::OnExtensionLoaded(
     return;
   }
 
-  extensions_.Update(extension);
+  extensions_.Insert(extension);
 }
 
 void RenderThread::OnSetExtensionScriptingWhitelist(
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index dae461d..f01fbc6 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -16,8 +16,8 @@
 #include "build/build_config.h"
 #include "chrome/common/child_thread.h"
 #include "chrome/common/css_colors.h"
+#include "chrome/common/extensions/extension_set.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"
@@ -27,7 +27,7 @@ class AppCacheDispatcher;
 class CookieMessageFilter;
 class DBMessageFilter;
 class DevToolsAgentFilter;
-class ExtensionRendererInfo;
+class ExtensionSet;
 class FilePath;
 class GpuChannelHost;
 class IndexedDBDispatcher;
@@ -105,10 +105,10 @@ class RenderThreadBase {
  public:
   virtual ~RenderThreadBase() {}
 
-  // Information about currently loaded extensions. This is essentially the
-  // renderer counterpart to ExtensionService in the browser. It contains
-  // information about all extensions currently loaded by the browser.
-  virtual const ExtensionRendererInfo* GetExtensions() const = 0;
+  // Gets currently loaded extensions. This is essentially the renderer
+  // counterpart to ExtensionService in the browser. It contains information
+  // about all extensions currently loaded by the browser.
+  virtual const ExtensionSet* GetExtensions() const = 0;
 
   virtual bool Send(IPC::Message* msg) = 0;
 
@@ -162,7 +162,7 @@ class RenderThread : public RenderThreadBase,
   static int32 RoutingIDForCurrentContext();
 
   // Overridden from RenderThreadBase.
-  virtual const ExtensionRendererInfo* GetExtensions() const;
+  virtual const ExtensionSet* GetExtensions() const;
   virtual bool Send(IPC::Message* msg);
   virtual void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
   virtual void RemoveRoute(int32 routing_id);
@@ -421,7 +421,7 @@ class RenderThread : public RenderThreadBase,
   std::map<std::string, bool> v8_extensions_;
 
   // Contains all loaded extensions.
-  ExtensionRendererInfo extensions_;
+  ExtensionSet extensions_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThread);
 };
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 1e2be18..3df214e 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -31,6 +31,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/database_messages.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/file_system/file_system_dispatcher.h"
 #include "chrome/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "chrome/common/json_value_serializer.h"
@@ -58,7 +59,6 @@
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/external_popup_menu.h"
@@ -389,7 +389,7 @@ static bool IsWhitelistedForContentSettings(WebFrame* frame) {
 // we would enter an extension app's extent from a non-app.  We avoid swapping
 // processes to exit an app for now, since we do not yet restore context (such
 // as window.opener) if the window navigates back.
-static bool CrossesIntoExtensionExtent(const ExtensionRendererInfo* extensions,
+static bool CrossesIntoExtensionExtent(const ExtensionSet* extensions,
                                        WebFrame* frame,
                                        const GURL& new_url) {
   // If the URL is still empty, this is a window.open navigation. Check the
diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc
index 3a1c5a5..7581b40 100644
--- a/chrome/renderer/user_script_slave.cc
+++ b/chrome/renderer/user_script_slave.cc
@@ -14,9 +14,9 @@
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extension_groups.h"
-#include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/render_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/renderer_resources.h"
@@ -60,7 +60,7 @@ int UserScriptSlave::GetIsolatedWorldId(const std::string& extension_id) {
   return new_id;
 }
 
-UserScriptSlave::UserScriptSlave(const ExtensionRendererInfo* extensions)
+UserScriptSlave::UserScriptSlave(const ExtensionSet* extensions)
     : shared_memory_(NULL),
       script_deleter_(&scripts_),
       extensions_(extensions) {
diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h
index ab1cee0..a03e8a6 100644
--- a/chrome/renderer/user_script_slave.h
+++ b/chrome/renderer/user_script_slave.h
@@ -17,7 +17,7 @@
 #include "chrome/common/extensions/user_script.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 
-class ExtensionRendererInfo;
+class ExtensionSet;
 
 namespace WebKit {
 class WebFrame;
@@ -28,7 +28,7 @@ using WebKit::WebScriptSource;
 // Manages installed UserScripts for a render process.
 class UserScriptSlave {
  public:
-  UserScriptSlave(const ExtensionRendererInfo* extensions);
+  UserScriptSlave(const ExtensionSet* extensions);
   ~UserScriptSlave();
 
   // Returns the unique set of extension IDs this UserScriptSlave knows about.
@@ -58,7 +58,7 @@ class UserScriptSlave {
   base::StringPiece api_js_;
 
   // Extension metadata.
-  const ExtensionRendererInfo* extensions_;
+  const ExtensionSet* extensions_;
 
   DISALLOW_COPY_AND_ASSIGN(UserScriptSlave);
 };