Move c/c/e/extension_set to top-level extensions/

Move extension_set.h/cc and extension_set_unittest to extensions/common/.
Remove unused includes.
Add includes where transitive includes were used.
Update DEPS.
No functional changes.

BUG=162530
TBR=sky@chromium.org (c/b/autocomplete, c/b/ui, c/test)
TBR=jam@chromium.org (c/b/automation)
TBR=atwilson@chromium.org (c/b/background, c/b/sync, c/b/policy)
TBR=bauerb@chromium.org (c/b/browsing_data, c/b/content_settings, c/b/managed_mode)
TBR=satorux@chromium.org (c/b/chromeos)
TBR=yurys@chromium.org (c/b/devtools)
TBR=thestig@chromium.org (c/b/media_galleries)
TBR=stevenjb@chromium.org (c/b/notifications)
TBR=battre@chromium.org (c/b/profile_resetter)
TBR=dmazzoni@chromium.org (c/b/speech)
TBR=kinuko@chromium.org (c/b/sync_file_system)
TBR=pkotwicz@chromium.org (c/b/themes)

Review URL: https://codereview.chromium.org/102103005

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

37 files changed, 92 insertions, 75 deletions

diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h
index fe43fb8..07d7154 100644
--- a/chrome/browser/extensions/active_tab_permission_granter.h
+++ b/chrome/browser/extensions/active_tab_permission_granter.h
@@ -8,10 +8,10 @@
 #include <set>
 #include <string>
 
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/url_pattern_set.h"
 
 class Profile;
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 4037c53..7b32223 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -52,6 +52,7 @@
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_resource.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/install_warning.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
@@ -130,10 +131,10 @@ bool ValidateFolderName(const base::FilePath::StringType& name) {
   return name == name_sanitized;
 }
 
-const Extension* GetExtensionByPath(const ExtensionSet* extensions,
+const Extension* GetExtensionByPath(const extensions::ExtensionSet* extensions,
                                     const base::FilePath& path) {
   base::FilePath extension_path = base::MakeAbsoluteFilePath(path);
-  for (ExtensionSet::const_iterator iter = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator iter = extensions->begin();
        iter != extensions->end(); ++iter) {
     if ((*iter)->path() == extension_path)
       return iter->get();
@@ -529,7 +530,7 @@ bool DeveloperPrivateGetItemsInfoFunction::RunImpl() {
   bool include_disabled = params->include_disabled;
   bool include_terminated = params->include_terminated;
 
-  ExtensionSet items;
+  extensions::ExtensionSet items;
 
   ExtensionService* service = GetProfile()->GetExtensionService();
 
@@ -546,7 +547,7 @@ bool DeveloperPrivateGetItemsInfoFunction::RunImpl() {
   std::map<std::string, ExtensionResource> id_to_icon;
   ItemInfoList item_list;
 
-  for (ExtensionSet::const_iterator iter = items.begin();
+  for (extensions::ExtensionSet::const_iterator iter = items.begin();
        iter != items.end(); ++iter) {
     const Extension& item = *iter->get();
 
@@ -1135,7 +1136,7 @@ bool DeveloperPrivateLoadProjectFunction::RunImpl() {
   ExtensionService* service = GetProfile()->GetExtensionService();
   UnpackedInstaller::Create(service)->Load(path);
 
-  const ExtensionSet* extensions = service->extensions();
+  const extensions::ExtensionSet* extensions = service->extensions();
   // Released by GetUnpackedExtension.
   AddRef();
   content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE,
@@ -1146,7 +1147,7 @@ bool DeveloperPrivateLoadProjectFunction::RunImpl() {
 
 void DeveloperPrivateLoadProjectFunction::GetUnpackedExtension(
     const base::FilePath& path,
-    const ExtensionSet* extensions) {
+    const extensions::ExtensionSet* extensions) {
   const Extension* extension = GetExtensionByPath(extensions, path);
   bool success = true;
   if (extension) {
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
index 6c7b0e9..5e6a0b3 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/extensions/api/push_messaging.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
index 8611c89..f86684c 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc
@@ -13,9 +13,9 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
+#include "extensions/common/extension_set.h"
 #include "net/dns/mock_host_resolver.h"
 
 namespace {
diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
index 2221376..7e3aa58 100644
--- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
+++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
@@ -24,7 +24,6 @@
 #include "chrome/browser/value_store/value_store_change.h"
 #include "chrome/common/extensions/api/storage.h"
 #include "chrome/common/extensions/api/storage/storage_schema_manifest_handler.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/schema.h"
 #include "components/policy/core/common/schema_map.h"
@@ -36,6 +35,7 @@
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/one_shot_event.h"
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc
index e104f92..e4461ee 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc
@@ -53,6 +53,7 @@
 #include "extensions/common/error_utils.h"
 #include "extensions/common/event_filtering_info.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/url_pattern.h"
@@ -2361,9 +2362,9 @@ void SendExtensionWebRequestStatusToHost(content::RenderProcessHost* host) {
   bool adblock = false;
   bool adblock_plus = false;
   bool other = false;
-  const ExtensionSet* extensions =
+  const extensions::ExtensionSet* extensions =
       profile->GetExtensionService()->extensions();
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     if (profile->GetExtensionService()->HasUsedWebRequest(it->get())) {
       if ((*it)->name().find("Adblock Plus") != std::string::npos) {
diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc
index d8e2cdd..138d11a1 100644
--- a/chrome/browser/extensions/app_sync_bundle.cc
+++ b/chrome/browser/extensions/app_sync_bundle.cc
@@ -6,10 +6,10 @@
 
 #include "base/location.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_error_factory.h"
 
diff --git a/chrome/browser/extensions/app_sync_bundle.h b/chrome/browser/extensions/app_sync_bundle.h
index 7fa8d17..0b69ac4 100644
--- a/chrome/browser/extensions/app_sync_bundle.h
+++ b/chrome/browser/extensions/app_sync_bundle.h
@@ -17,7 +17,6 @@
 #include "sync/api/syncable_service.h"
 
 class ExtensionSyncService;
-class ExtensionSet;
 
 namespace syncer {
 class SyncChangeProcessor;
@@ -27,6 +26,7 @@ class SyncErrorFactory;
 namespace extensions {
 
 class Extension;
+class ExtensionSet;
 
 // Bundle of app specific sync stuff.
 class AppSyncBundle : public SyncBundle {
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 64f67d8..ad0624b 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -11,12 +11,12 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc
index 9f4c7be..7156622 100644
--- a/chrome/browser/extensions/error_console/error_console.cc
+++ b/chrome/browser/extensions/error_console/error_console.cc
@@ -17,13 +17,13 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.h"
 
 namespace extensions {
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 79d4711..b08a58a 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -19,6 +19,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ -393,7 +394,8 @@ const extensions::Extension* ExtensionApiTest::GetSingleLoadedExtension() {
       browser()->profile())->extension_service();
 
   const extensions::Extension* extension = NULL;
-  for (ExtensionSet::const_iterator it = service->extensions()->begin();
+  for (extensions::ExtensionSet::const_iterator it =
+           service->extensions()->begin();
        it != service->extensions()->end(); ++it) {
     // Ignore any component extensions. They are automatically loaded into all
     // profiles and aren't the extension we're looking for here.
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 863906f..014783f 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -34,7 +34,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -43,6 +42,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/extension_set.h"
 #include "sync/api/string_ordinal.h"
 
 #if defined(OS_CHROMEOS)
@@ -80,10 +80,10 @@ Profile* ExtensionBrowserTest::profile() {
 
 // static
 const Extension* ExtensionBrowserTest::GetExtensionByPath(
-    const ExtensionSet* extensions, const base::FilePath& path) {
+    const extensions::ExtensionSet* extensions, const base::FilePath& path) {
   base::FilePath extension_path = base::MakeAbsoluteFilePath(path);
   EXPECT_TRUE(!extension_path.empty());
-  for (ExtensionSet::const_iterator iter = extensions->begin();
+  for (extensions::ExtensionSet::const_iterator iter = extensions->begin();
        iter != extensions->end(); ++iter) {
     if ((*iter)->path() == extension_path) {
       return iter->get();
@@ -453,7 +453,8 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
             << " num after: " << base::IntToString(num_after)
             << " Installed extensions follow:";
 
-    for (ExtensionSet::const_iterator it = service->extensions()->begin();
+    for (extensions::ExtensionSet::const_iterator it =
+             service->extensions()->begin();
          it != service->extensions()->end(); ++it)
       VLOG(1) << "  " << (*it)->id();
 
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index f70537c..47b37d7 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -23,10 +23,10 @@
 #include "extensions/common/manifest.h"
 
 class ExtensionService;
-class ExtensionSet;
 class Profile;
 
 namespace extensions {
+class ExtensionSet;
 class ProcessManager;
 }
 
@@ -69,7 +69,7 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest {
   Profile* profile();
 
   static const extensions::Extension* GetExtensionByPath(
-      const ExtensionSet* extensions, const base::FilePath& path);
+      const extensions::ExtensionSet* extensions, const base::FilePath& path);
 
   // InProcessBrowserTest
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc
index 616465a..77bd71f 100644
--- a/chrome/browser/extensions/extension_context_menu_browsertest.cc
+++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc
@@ -16,6 +16,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/common/context_menu_params.h"
 #include "extensions/browser/test_management_policy.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/switches.h"
 #include "net/dns/mock_host_resolver.h"
 #include "ui/base/models/menu_model.h"
@@ -133,10 +134,10 @@ class ExtensionContextMenuBrowserTest : public ExtensionBrowserTest {
   // Returns a pointer to the currently loaded extension with |name|, or null
   // if not found.
   const extensions::Extension* GetExtensionNamed(std::string name) {
-    const ExtensionSet* extensions =
+    const extensions::ExtensionSet* extensions =
         browser()->profile()->GetExtensionService()->extensions();
-    ExtensionSet::const_iterator i;
-    for (i = extensions->begin(); i != extensions->end(); ++i) {
+    for (extensions::ExtensionSet::const_iterator i = extensions->begin();
+         i != extensions->end(); ++i) {
       if ((*i)->name() == name) {
         return i->get();
       }
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 1365e4a..807607a 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -23,7 +23,6 @@
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/common/extensions/extension_messages.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
@@ -35,6 +34,7 @@
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/common/extension_api.h"
+#include "extensions/common/extension_set.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "webkit/common/resource_type.h"
diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc
index cca0c28..76e1315 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.cc
+++ b/chrome/browser/extensions/extension_keybinding_registry.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_constants.h"
 
 namespace extensions {
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 9c61f40..b8b68fd 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -113,6 +113,7 @@ using extensions::CrxInstaller;
 using extensions::Extension;
 using extensions::ExtensionIdSet;
 using extensions::ExtensionInfo;
+using extensions::ExtensionSet;
 using extensions::FeatureSwitch;
 using extensions::InstallVerifier;
 using extensions::ManagementPolicy;
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index f838465..486f996 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -23,7 +23,6 @@
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -34,6 +33,7 @@
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/shared_module_info.h"
 #include "extensions/common/one_shot_event.h"
@@ -72,8 +72,8 @@ class ExtensionServiceInterface
     : public base::SupportsWeakPtr<ExtensionServiceInterface> {
  public:
   virtual ~ExtensionServiceInterface() {}
-  virtual const ExtensionSet* extensions() const = 0;
-  virtual const ExtensionSet* disabled_extensions() const = 0;
+  virtual const extensions::ExtensionSet* extensions() const = 0;
+  virtual const extensions::ExtensionSet* disabled_extensions() const = 0;
   virtual extensions::PendingExtensionManager* pending_extension_manager() = 0;
 
   // Install an update.  Return true if the install can be started.
@@ -158,15 +158,15 @@ class ExtensionService
   virtual ~ExtensionService();
 
   // Gets the list of currently installed extensions.
-  virtual const ExtensionSet* extensions() const OVERRIDE;
-  virtual const ExtensionSet* disabled_extensions() const OVERRIDE;
-  const ExtensionSet* terminated_extensions() const;
-  const ExtensionSet* blacklisted_extensions() const;
-  const ExtensionSet* delayed_installs() const;
+  virtual const extensions::ExtensionSet* extensions() const OVERRIDE;
+  virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE;
+  const extensions::ExtensionSet* terminated_extensions() const;
+  const extensions::ExtensionSet* blacklisted_extensions() const;
+  const extensions::ExtensionSet* delayed_installs() const;
 
   // Returns a set of all installed, disabled, blacklisted, and terminated
   // extensions.
-  scoped_ptr<ExtensionSet> GenerateInstalledExtensionsSet() const;
+  scoped_ptr<extensions::ExtensionSet> GenerateInstalledExtensionsSet() const;
 
   // Gets the object managing the set of pending extensions.
   virtual extensions::PendingExtensionManager*
@@ -376,7 +376,7 @@ class ExtensionService
   ImportStatus SatisfyImports(const extensions::Extension* extension);
 
   // Returns a set of extensions that import a given extension.
-  scoped_ptr<const ExtensionSet> GetDependentExtensions(
+  scoped_ptr<const extensions::ExtensionSet> GetDependentExtensions(
       const extensions::Extension* extension);
 
   // Uninstalls shared modules that were only referenced by |extension|.
@@ -734,23 +734,23 @@ class ExtensionService
   ExtensionSyncService* extension_sync_service_;
 
   // The current list of installed extensions.
-  ExtensionSet extensions_;
+  extensions::ExtensionSet extensions_;
 
   // The list of installed extensions that have been disabled.
-  ExtensionSet disabled_extensions_;
+  extensions::ExtensionSet disabled_extensions_;
 
   // The list of installed extensions that have been terminated.
-  ExtensionSet terminated_extensions_;
+  extensions::ExtensionSet terminated_extensions_;
 
   // The list of installed extensions that have been blacklisted. Generally
   // these shouldn't be considered as installed by the extension platform: we
   // only keep them around so that if extensions are blacklisted by mistake
   // they can easily be un-blacklisted.
-  ExtensionSet blacklisted_extensions_;
+  extensions::ExtensionSet blacklisted_extensions_;
 
   // The list of extension installs delayed for various reasons.  The reason
   // for delayed install is stored in ExtensionPrefs.
-  ExtensionSet delayed_installs_;
+  extensions::ExtensionSet delayed_installs_;
 
   // Hold the set of pending extensions.
   extensions::PendingExtensionManager pending_extension_manager_;
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index a0b3c69..4601480 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -3369,8 +3369,8 @@ TEST_F(ExtensionServiceTest, SetUnsetBlacklistInPrefs) {
   InitializeGoodInstalledExtensionService();
   service_->Init();
 
-  const ExtensionSet* extensions = service_->extensions();
-  const ExtensionSet* blacklisted_extensions =
+  const extensions::ExtensionSet* extensions = service_->extensions();
+  const extensions::ExtensionSet* blacklisted_extensions =
       service_->blacklisted_extensions();
 
   EXPECT_TRUE( extensions->Contains(good0) &&
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index 8cf296d..c79049c 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -18,6 +18,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 using content::BrowserThread;
 using extensions::APIPermission;
@@ -86,7 +87,8 @@ bool ExtensionSpecialStoragePolicy::NeedsProtection(
   return extension->is_hosted_app() && !extension->from_bookmark();
 }
 
-const ExtensionSet* ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin(
+const extensions::ExtensionSet*
+ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin(
     const GURL& origin) {
   base::AutoLock locker(lock_);
   return protected_apps_.ExtensionsContaining(origin);
@@ -229,15 +231,15 @@ bool ExtensionSpecialStoragePolicy::SpecialCollection::Contains(
   return !ExtensionsContaining(origin)->is_empty();
 }
 
-const ExtensionSet*
+const extensions::ExtensionSet*
 ExtensionSpecialStoragePolicy::SpecialCollection::ExtensionsContaining(
     const GURL& origin) {
   CachedResults::const_iterator found = cached_results_.find(origin);
   if (found != cached_results_.end())
     return found->second;
 
-  ExtensionSet* result = new ExtensionSet();
-  for (ExtensionSet::const_iterator iter = extensions_.begin();
+  extensions::ExtensionSet* result = new extensions::ExtensionSet();
+  for (extensions::ExtensionSet::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     if ((*iter)->OverlapsWithOrigin(origin))
       result->Insert(*iter);
diff --git a/chrome/browser/extensions/extension_special_storage_policy.h b/chrome/browser/extensions/extension_special_storage_policy.h
index 494c65a..aa04bd6 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.h
+++ b/chrome/browser/extensions/extension_special_storage_policy.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/synchronization/lock.h"
-#include "chrome/common/extensions/extension_set.h"
+#include "extensions/common/extension_set.h"
 #include "url/gurl.h"
 #include "webkit/browser/quota/special_storage_policy.h"
 
@@ -46,7 +46,8 @@ class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy {
 
   // Returns the set of extensions protecting this origin. The caller does not
   // take ownership of the return value.
-  const ExtensionSet* ExtensionsProtectingOrigin(const GURL& origin);
+  const extensions::ExtensionSet* ExtensionsProtectingOrigin(
+      const GURL& origin);
 
  protected:
   virtual ~ExtensionSpecialStoragePolicy();
@@ -58,18 +59,18 @@ class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy {
     ~SpecialCollection();
 
     bool Contains(const GURL& origin);
-    const ExtensionSet* ExtensionsContaining(const GURL& origin);
+    const extensions::ExtensionSet* ExtensionsContaining(const GURL& origin);
     bool ContainsExtension(const std::string& extension_id);
     bool Add(const extensions::Extension* extension);
     bool Remove(const extensions::Extension* extension);
     void Clear();
 
    private:
-    typedef std::map<GURL, ExtensionSet*> CachedResults;
+    typedef std::map<GURL, extensions::ExtensionSet*> CachedResults;
 
     void ClearCache();
 
-    ExtensionSet extensions_;
+    extensions::ExtensionSet extensions_;
     CachedResults cached_results_;
   };
 
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index 71ef27f..104cbcb 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -11,12 +11,14 @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using extensions::Extension;
+using extensions::ExtensionSet;
 using extensions::Manifest;
 using quota::SpecialStoragePolicy;
 
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index f65d666..15404c9 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -26,6 +26,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.h"
 #include "net/base/net_util.h"
 
@@ -95,7 +97,8 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
 
     // Count the number of non-component extensions.
     int found_extensions = 0;
-    for (ExtensionSet::const_iterator it = service->extensions()->begin();
+    for (extensions::ExtensionSet::const_iterator it =
+             service->extensions()->begin();
          it != service->extensions()->end(); ++it)
       if ((*it)->location() != extensions::Manifest::COMPONENT)
         found_extensions++;
@@ -185,7 +188,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) {
 
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
-  for (ExtensionSet::const_iterator it = service->extensions()->begin();
+  for (extensions::ExtensionSet::const_iterator it =
+           service->extensions()->begin();
        it != service->extensions()->end(); ++it) {
     if ((*it)->location() == extensions::Manifest::COMPONENT)
       continue;
diff --git a/chrome/browser/extensions/extension_sync_bundle.cc b/chrome/browser/extensions/extension_sync_bundle.cc
index 4786091..b313c0e 100644
--- a/chrome/browser/extensions/extension_sync_bundle.cc
+++ b/chrome/browser/extensions/extension_sync_bundle.cc
@@ -6,9 +6,9 @@
 
 #include "base/location.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_error_factory.h"
 
diff --git a/chrome/browser/extensions/extension_sync_bundle.h b/chrome/browser/extensions/extension_sync_bundle.h
index 3dadc1e..fa805a4 100644
--- a/chrome/browser/extensions/extension_sync_bundle.h
+++ b/chrome/browser/extensions/extension_sync_bundle.h
@@ -17,7 +17,6 @@
 #include "sync/api/syncable_service.h"
 
 class ExtensionSyncService;
-class ExtensionSet;
 
 namespace syncer {
 class SyncChangeProcessor;
@@ -27,6 +26,7 @@ class SyncErrorFactory;
 namespace extensions {
 
 class Extension;
+class ExtensionSet;
 
 // Bundle of extension specific sync stuff.
 class ExtensionSyncBundle : public SyncBundle {
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index 40f7957..e180acf 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/chrome/browser/extensions/extension_toolbar_model.cc
@@ -25,6 +25,7 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.h"
 
 using extensions::Extension;
@@ -336,7 +337,8 @@ void ExtensionToolbarModel::Populate(
       extensions::ExtensionActionManager::Get(profile_);
 
   // Create the lists.
-  for (ExtensionSet::const_iterator it = service->extensions()->begin();
+  for (extensions::ExtensionSet::const_iterator it =
+           service->extensions()->begin();
        it != service->extensions()->end(); ++it) {
     const Extension* extension = it->get();
     if (!extension_action_manager->GetBrowserAction(*extension))
diff --git a/chrome/browser/extensions/extension_warning_service.h b/chrome/browser/extensions/extension_warning_service.h
index 03e8499..0062e53 100644
--- a/chrome/browser/extensions/extension_warning_service.h
+++ b/chrome/browser/extensions/extension_warning_service.h
@@ -12,7 +12,6 @@
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/extensions/extension_warning_set.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc
index 7faeef5..1c4df71 100644
--- a/chrome/browser/extensions/extension_warning_set.cc
+++ b/chrome/browser/extensions/extension_warning_set.cc
@@ -7,9 +7,9 @@
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
diff --git a/chrome/browser/extensions/extension_warning_set.h b/chrome/browser/extensions/extension_warning_set.h
index 9e00823..c064664 100644
--- a/chrome/browser/extensions/extension_warning_set.h
+++ b/chrome/browser/extensions/extension_warning_set.h
@@ -17,10 +17,10 @@ namespace base {
 class FilePath;
 }
 
-class ExtensionSet;
-
 namespace extensions {
 
+class ExtensionSet;
+
 // This class is used by the ExtensionWarningService to represent warnings if
 // extensions misbehave. Note that the ExtensionWarningService deals only with
 // specific warnings that should trigger a badge on the Chrome menu button.
diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc
index 8631e70..8919be1 100644
--- a/chrome/browser/extensions/page_action_controller.cc
+++ b/chrome/browser/extensions/page_action_controller.cc
@@ -15,11 +15,11 @@
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/common/extension_set.h"
 
 namespace extensions {
 
diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc
index d701652..5b6411c 100644
--- a/chrome/browser/extensions/script_badge_controller.cc
+++ b/chrome/browser/extensions/script_badge_controller.cc
@@ -17,13 +17,13 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/extensions/extension_messages.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "url/gurl.h"
diff --git a/chrome/browser/extensions/test_extension_service.cc b/chrome/browser/extensions/test_extension_service.cc
index f506e96..d88db90 100644
--- a/chrome/browser/extensions/test_extension_service.cc
+++ b/chrome/browser/extensions/test_extension_service.cc
@@ -10,12 +10,13 @@ using extensions::Extension;
 
 TestExtensionService::~TestExtensionService() {}
 
-const ExtensionSet* TestExtensionService::extensions() const {
+const extensions::ExtensionSet* TestExtensionService::extensions() const {
   ADD_FAILURE();
   return NULL;
 }
 
-const ExtensionSet* TestExtensionService::disabled_extensions() const {
+const extensions::ExtensionSet* TestExtensionService::disabled_extensions()
+    const {
   ADD_FAILURE();
   return NULL;
 }
diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h
index 7824b41..10f5413 100644
--- a/chrome/browser/extensions/test_extension_service.h
+++ b/chrome/browser/extensions/test_extension_service.h
@@ -23,8 +23,8 @@ class TestExtensionService : public ExtensionServiceInterface {
   virtual ~TestExtensionService();
 
   // ExtensionServiceInterface implementation.
-  virtual const ExtensionSet* extensions() const OVERRIDE;
-  virtual const ExtensionSet* disabled_extensions() const OVERRIDE;
+  virtual const extensions::ExtensionSet* extensions() const OVERRIDE;
+  virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE;
   virtual extensions::PendingExtensionManager*
       pending_extension_manager() OVERRIDE;
 
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
index 3cb4bc4ef..f629a85 100644
--- a/chrome/browser/extensions/updater/extension_updater.cc
+++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -22,7 +22,6 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/updater/extension_downloader.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
@@ -32,6 +31,7 @@
 #include "extensions/browser/pending_extension_manager.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 
 using base::RandDouble;
diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
index b178aec..48107a7 100644
--- a/chrome/browser/extensions/updater/extension_updater.h
+++ b/chrome/browser/extensions/updater/extension_updater.h
@@ -26,7 +26,6 @@
 #include "url/gurl.h"
 
 class ExtensionServiceInterface;
-class ExtensionSet;
 class PrefService;
 class Profile;
 
@@ -34,6 +33,7 @@ namespace extensions {
 
 class ExtensionDownloader;
 class ExtensionPrefs;
+class ExtensionSet;
 class ExtensionUpdaterTest;
 
 // A class for doing auto-updates of installed Extensions. Used like this:
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index 3f5692a..ebde012 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -24,13 +24,13 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/extension_file_util.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_resource.h"
+#include "extensions/common/extension_set.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 76f01fd..ddcc1f5b 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -15,10 +15,10 @@
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_piece.h"
 #include "chrome/common/extensions/extension_messages.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/user_script.h"
 
 namespace content {
@@ -27,11 +27,11 @@ class RenderProcessHost;
 
 class Profile;
 
+namespace extensions {
+
 typedef std::map<std::string, ExtensionSet::ExtensionPathAndDefaultLocale>
     ExtensionsInfo;
 
-namespace extensions {
-
 // Manages a segment of shared memory that contains the user scripts the user
 // has installed.  Lives on the UI thread.
 class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,