Move ExtensionSystem into extensions namespace

BUG=134017, 117261
TEST=


Review URL: https://chromiumcodereview.appspot.com/10626007

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

65 files changed, 223 insertions, 189 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
index 256a2dd..f757df2 100644
--- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
+++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
@@ -32,7 +32,7 @@ ProfileKeyedService* AutocompleteClassifierFactory::BuildInstanceFor(
 AutocompleteClassifierFactory::AutocompleteClassifierFactory()
     : ProfileKeyedServiceFactory("AutocompleteClassifier",
                                  ProfileDependencyManager::GetInstance()) {
-  DependsOn(ExtensionSystemFactory::GetInstance());
+  DependsOn(extensions::ExtensionSystemFactory::GetInstance());
   DependsOn(TemplateURLServiceFactory::GetInstance());
   // TODO(pkasting): Uncomment these once they exist.
   //   DependsOn(PrefServiceFactory::GetInstance());
diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc
index 6af0b5a..5c91c84 100644
--- a/chrome/browser/autocomplete/extension_app_provider.cc
+++ b/chrome/browser/autocomplete/extension_app_provider.cc
@@ -42,7 +42,8 @@ void ExtensionAppProvider::LaunchAppFromOmnibox(
     Profile* profile,
     WindowOpenDisposition disposition) {
   ExtensionService* service =
-      ExtensionSystemFactory::GetForProfile(profile)->extension_service();
+      extensions::ExtensionSystemFactory::GetForProfile(profile)->
+      extension_service();
   const extensions::Extension* extension =
       service->GetInstalledApp(match.destination_url);
   // While the Omnibox popup is open, the extension can be updated, changing
@@ -149,7 +150,8 @@ ExtensionAppProvider::~ExtensionAppProvider() {
 
 void ExtensionAppProvider::RefreshAppList() {
   ExtensionService* extension_service =
-      ExtensionSystemFactory::GetForProfile(profile_)->extension_service();
+      extensions::ExtensionSystemFactory::GetForProfile(profile_)->
+      extension_service();
   if (!extension_service)
     return;  // During testing, there is no extension service.
   const ExtensionSet* extensions = extension_service->extensions();
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 91907f4..f56c028 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -644,7 +644,7 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::RegisterExtensionProcess,
-                 ExtensionSystem::Get(profile)->info_map(),
+                 extensions::ExtensionSystem::Get(profile)->info_map(),
                  extension->id(),
                  site_instance->GetProcess()->GetID(),
                  site_instance->GetId()));
@@ -673,7 +673,7 @@ void ChromeContentBrowserClient::SiteInstanceDeleting(
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::UnregisterExtensionProcess,
-                 ExtensionSystem::Get(profile)->info_map(),
+                 extensions::ExtensionSystem::Get(profile)->info_map(),
                  extension->id(),
                  site_instance->GetProcess()->GetID(),
                  site_instance->GetId()));
diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc
index 3bdc711..10345a6 100644
--- a/chrome/browser/chromeos/extensions/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_handler_util.cc
@@ -776,7 +776,8 @@ void ExtensionTaskExecutor::OnInitAccessForExecuteFileActionsOnUIThread(
   } else {
     // We have to wake the handler background page before we proceed.
     extensions::LazyBackgroundTaskQueue* queue =
-        ExtensionSystem::Get(profile())->lazy_background_task_queue();
+        extensions::ExtensionSystem::Get(profile())->
+        lazy_background_task_queue();
     if (!queue->ShouldEnqueueTask(profile(), extension)) {
       ExecuteDoneOnUIThread(false);
       return;
diff --git a/chrome/browser/download/download_crx_util.cc b/chrome/browser/download/download_crx_util.cc
index ef66f26..016bac0 100644
--- a/chrome/browser/download/download_crx_util.cc
+++ b/chrome/browser/download/download_crx_util.cc
@@ -47,8 +47,8 @@ ExtensionInstallPrompt* CreateExtensionInstallPrompt(Profile* profile) {
 }
 
 bool OffStoreInstallAllowedByPrefs(Profile* profile, const DownloadItem& item) {
-  extensions::ExtensionPrefs* prefs =
-      ExtensionSystem::Get(profile)->extension_service()->extension_prefs();
+  extensions::ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(
+      profile)->extension_service()->extension_prefs();
   CHECK(prefs);
 
   URLPatternSet url_patterns = prefs->GetAllowedInstallSites();
diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc
index 3e56f45..1e7bac01 100644
--- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc
+++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc
@@ -45,7 +45,7 @@ IN_PROC_BROWSER_TEST_F(DeclarativeApiTest, DeclarativeApi) {
   // is therefore processed after the UnloadExtension task has been executed.
 
   RulesRegistryService* rules_registry_service =
-      ExtensionSystemFactory::GetForProfile(browser()->profile())->
+      extensions::ExtensionSystemFactory::GetForProfile(browser()->profile())->
       rules_registry_service();
   scoped_refptr<RulesRegistry> rules_registry =
       rules_registry_service->GetRulesRegistry(
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index bb572f8..23c0f01 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -406,8 +406,8 @@ void CrxInstaller::ConfirmInstall() {
   }
 
   string16 error;
-  if (!ExtensionSystem::Get(profile_)->management_policy()->UserMayLoad(
-      extension_, &error)) {
+  if (!extensions::ExtensionSystem::Get(profile_)->management_policy()->
+      UserMayLoad(extension_, &error)) {
     ReportFailureFromUIThread(CrxInstallerError(error));
     return;
   }
diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc
index e54cb3a..565da65 100644
--- a/chrome/browser/extensions/extension_context_menu_browsertest.cc
+++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc
@@ -534,7 +534,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, PolicyDisablesItems) {
   scoped_refptr<ExtensionContextMenuModel> menu(
       new ExtensionContextMenuModel(extension, browser(), NULL));
 
-  ExtensionSystem::Get(
+  extensions::ExtensionSystem::Get(
       browser()->profile())->management_policy()->UnregisterAllProviders();
 
   // Actions should be enabled.
@@ -543,7 +543,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, PolicyDisablesItems) {
 
   extensions::TestManagementPolicyProvider policy_provider(
     extensions::TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS);
-  ExtensionSystem::Get(
+  extensions::ExtensionSystem::Get(
       browser()->profile())->management_policy()->RegisterProvider(
       &policy_provider);
 
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index b6a76ed..f38f2486 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -83,7 +83,7 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {
         tab_contents->extension_tab_helper()->tab_id());
   } else if (command_id == DISABLE || command_id == UNINSTALL) {
     // Some extension types can not be disabled or uninstalled.
-    return ExtensionSystem::Get(
+    return extensions::ExtensionSystem::Get(
         profile_)->management_policy()->UserMayModifySettings(extension, NULL);
   }
   return true;
diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
index ff331b7..6619e45 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -34,7 +34,7 @@ ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id,
       on_tab_close_event_name_(
           ExtensionDevToolsEvents::OnTabCloseEventNameForTab(tab_id)) {
   extension_devtools_manager_ =
-      ExtensionSystem::Get(profile)->devtools_manager();
+      extensions::ExtensionSystem::Get(profile)->devtools_manager();
   DCHECK(extension_devtools_manager_.get());
 }
 
diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc
index ff7f433..3d7747f 100644
--- a/chrome/browser/extensions/extension_event_router.cc
+++ b/chrome/browser/extensions/extension_event_router.cc
@@ -103,7 +103,7 @@ void ExtensionEventRouter::DispatchEvent(
 ExtensionEventRouter::ExtensionEventRouter(Profile* profile)
     : profile_(profile),
       extension_devtools_manager_(
-          ExtensionSystem::Get(profile)->devtools_manager()),
+          extensions::ExtensionSystem::Get(profile)->devtools_manager()),
       listeners_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::NotificationService::AllSources());
@@ -474,7 +474,7 @@ void ExtensionEventRouter::MaybeLoadLazyBackgroundPageToDispatchEvent(
     return;
 
   extensions::LazyBackgroundTaskQueue* queue =
-      ExtensionSystem::Get(profile)->lazy_background_task_queue();
+      extensions::ExtensionSystem::Get(profile)->lazy_background_task_queue();
   if (queue->ShouldEnqueueTask(profile, extension)) {
     queue->AddPendingTask(
         profile, extension->id(),
@@ -489,7 +489,7 @@ void ExtensionEventRouter::IncrementInFlightEvents(
   // because that's the only time we'll get an ACK.
   if (extension->has_lazy_background_page()) {
     ExtensionProcessManager* pm =
-        ExtensionSystem::Get(profile)->process_manager();
+        extensions::ExtensionSystem::Get(profile)->process_manager();
     ExtensionHost* host = pm->GetBackgroundHostForExtension(extension->id());
     if (host)
       pm->IncrementLazyKeepaliveCount(extension);
@@ -499,7 +499,7 @@ void ExtensionEventRouter::IncrementInFlightEvents(
 void ExtensionEventRouter::OnEventAck(
     Profile* profile, const std::string& extension_id) {
   ExtensionProcessManager* pm =
-      ExtensionSystem::Get(profile)->process_manager();
+      extensions::ExtensionSystem::Get(profile)->process_manager();
   ExtensionHost* host = pm->GetBackgroundHostForExtension(extension_id);
   // The event ACK is routed to the background host, so this should never be
   // NULL.
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 3a6f470..18f2d29 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -60,6 +60,7 @@ using content::OpenURLParams;
 using content::RenderViewHost;
 using content::SiteInstance;
 using content::WebContents;
+using extensions::ExtensionSystem;
 
 // Helper class that rate-limits the creation of renderer processes for
 // ExtensionHosts, to avoid blocking the UI.
diff --git a/chrome/browser/extensions/extension_management_api.cc b/chrome/browser/extensions/extension_management_api.cc
index dac8e06..1fd716b 100644
--- a/chrome/browser/extensions/extension_management_api.cc
+++ b/chrome/browser/extensions/extension_management_api.cc
@@ -75,7 +75,7 @@ static DictionaryValue* CreateExtensionInfo(const Extension& extension,
   bool enabled = service->IsExtensionEnabled(extension.id());
   extension.GetBasicInfo(enabled, info);
 
-  const extensions::ManagementPolicy* policy = ExtensionSystem::Get(
+  const extensions::ManagementPolicy* policy = extensions::ExtensionSystem::Get(
       service->profile())->management_policy();
   info->SetBoolean(keys::kMayDisableKey,
                    policy->UserMayModifySettings(&extension, NULL));
@@ -390,7 +390,7 @@ bool SetEnabledFunction::RunImpl() {
     return false;
   }
 
-  const extensions::ManagementPolicy* policy = ExtensionSystem::Get(
+  const extensions::ManagementPolicy* policy = extensions::ExtensionSystem::Get(
       profile())->management_policy();
   if (!policy->UserMayModifySettings(extension, NULL)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
@@ -466,7 +466,7 @@ bool UninstallFunction::RunImpl() {
     return false;
   }
 
-  if (!ExtensionSystem::Get(
+  if (!extensions::ExtensionSystem::Get(
       profile())->management_policy()->UserMayModifySettings(extension, NULL)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         keys::kUserCantModifyError, extension_id_);
diff --git a/chrome/browser/extensions/extension_management_apitest.cc b/chrome/browser/extensions/extension_management_apitest.cc
index f6cf9e1..5102e37 100644
--- a/chrome/browser/extensions/extension_management_apitest.cc
+++ b/chrome/browser/extensions/extension_management_apitest.cc
@@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, ManagementPolicyAllowed) {
                                         false));
 
   // Ensure that all actions are allowed.
-  ExtensionSystem::Get(
+  extensions::ExtensionSystem::Get(
       browser()->profile())->management_policy()->UnregisterAllProviders();
 
   ASSERT_TRUE(RunExtensionSubtest("management/management_policy",
@@ -120,8 +120,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, ManagementPolicyProhibited) {
                                         false));
 
   // Prohibit status changes.
-  extensions::ManagementPolicy* policy =
-      ExtensionSystem::Get(browser()->profile())->management_policy();
+  extensions::ManagementPolicy* policy = extensions::ExtensionSystem::Get(
+      browser()->profile())->management_policy();
   policy->UnregisterAllProviders();
   extensions::TestManagementPolicyProvider provider(
     extensions::TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS);
diff --git a/chrome/browser/extensions/extension_message_handler.cc b/chrome/browser/extensions/extension_message_handler.cc
index cc0ac25..75272f8 100644
--- a/chrome/browser/extensions/extension_message_handler.cc
+++ b/chrome/browser/extensions/extension_message_handler.cc
@@ -45,7 +45,7 @@ void ExtensionMessageHandler::OnPostMessage(int port_id,
   Profile* profile = Profile::FromBrowserContext(
       render_view_host()->GetProcess()->GetBrowserContext());
   ExtensionMessageService* message_service =
-      ExtensionSystem::Get(profile)->message_service();
+      extensions::ExtensionSystem::Get(profile)->message_service();
   if (message_service) {
     message_service->PostMessageFromRenderer(port_id, message);
   }
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 6f4a6cd..d9f5477 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -139,7 +139,7 @@ static void IncrementLazyKeepaliveCount(
   Profile* profile =
       Profile::FromBrowserContext(port->process->GetBrowserContext());
   ExtensionProcessManager* pm =
-      ExtensionSystem::Get(profile)->process_manager();
+      extensions::ExtensionSystem::Get(profile)->process_manager();
   ExtensionHost* host = pm->GetBackgroundHostForExtension(port->extension_id);
   if (host && host->extension()->has_lazy_background_page())
     pm->IncrementLazyKeepaliveCount(host->extension());
@@ -154,7 +154,7 @@ static void DecrementLazyKeepaliveCount(
   Profile* profile =
       Profile::FromBrowserContext(port->process->GetBrowserContext());
   ExtensionProcessManager* pm =
-      ExtensionSystem::Get(profile)->process_manager();
+      extensions::ExtensionSystem::Get(profile)->process_manager();
   ExtensionHost* host = pm->GetBackgroundHostForExtension(port->extension_id);
   if (host && host == port->background_host_ptr)
     pm->DecrementLazyKeepaliveCount(host->extension());
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 3d29c9f..5bee5e9 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -339,7 +339,7 @@ const Extension* ExtensionProcessManager::GetExtensionForRenderViewHost(
     return NULL;
 
   ExtensionService* service =
-      ExtensionSystem::Get(GetProfile())->extension_service();
+      extensions::ExtensionSystem::Get(GetProfile())->extension_service();
   return service->extensions()->GetByID(GetExtensionID(render_view_host));
 }
 
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 1f2a887..5f6520e 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -326,7 +326,7 @@ ExtensionService::ExtensionService(Profile* profile,
                                    bool autoupdate_enabled,
                                    bool extensions_enabled)
     : profile_(profile),
-      system_(ExtensionSystem::Get(profile)),
+      system_(extensions::ExtensionSystem::Get(profile)),
       extension_prefs_(extension_prefs),
       settings_frontend_(extensions::SettingsFrontend::Create(profile)),
       pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)),
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index b5e83615..3673dc9 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -57,7 +57,6 @@ class ExtensionManagedModeEventRouter;
 class ExtensionManagementEventRouter;
 class ExtensionPreferenceEventRouter;
 class ExtensionSyncData;
-class ExtensionSystem;
 class ExtensionToolbarModel;
 class HistoryExtensionEventRouter;
 class GURL;
@@ -82,6 +81,7 @@ class ContentSettingsStore;
 class Extension;
 class ExtensionCookiesEventRouter;
 class ExtensionSyncData;
+class ExtensionSystem;
 class ExtensionUpdater;
 class SettingsFrontend;
 class WebNavigationEventRouter;
@@ -708,7 +708,7 @@ class ExtensionService
   Profile* profile_;
 
   // The ExtensionSystem for the profile above.
-  ExtensionSystem* system_;
+  extensions::ExtensionSystem* system_;
 
   // Preferences for the owning profile (weak reference).
   extensions::ExtensionPrefs* extension_prefs_;
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 3330bbb..2313467 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -101,6 +101,7 @@ using extensions::APIPermissionSet;
 using extensions::Extension;
 using extensions::ExtensionCreator;
 using extensions::ExtensionPrefs;
+using extensions::ExtensionSystem;
 using extensions::PermissionSet;
 
 namespace keys = extension_manifest_keys;
@@ -421,7 +422,7 @@ void ExtensionServiceTestBase::InitializeExtensionService(
 
   profile_.reset(profile);
 
-  service_ = static_cast<TestExtensionSystem*>(
+  service_ = static_cast<extensions::TestExtensionSystem*>(
       ExtensionSystem::Get(profile))->CreateExtensionService(
           CommandLine::ForCurrentProcess(),
           extensions_install_dir,
@@ -429,7 +430,7 @@ void ExtensionServiceTestBase::InitializeExtensionService(
   service_->set_extensions_enabled(true);
   service_->set_show_extensions_prompts(false);
 
-  management_policy_ = static_cast<TestExtensionSystem*>(
+  management_policy_ = static_cast<extensions::TestExtensionSystem*>(
       ExtensionSystem::Get(profile))->CreateManagementPolicy();
 
   // When we start up, we want to make sure there is no external provider,
@@ -464,7 +465,7 @@ void ExtensionServiceTestBase::InitializeEmptyExtensionService() {
 }
 
 void ExtensionServiceTestBase::InitializeExtensionProcessManager() {
-  static_cast<TestExtensionSystem*>(
+  static_cast<extensions::TestExtensionSystem*>(
       ExtensionSystem::Get(profile_.get()))->
       CreateExtensionProcessManager();
 }
@@ -4077,7 +4078,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
 
   // By default, we are enabled.
   command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
-  ExtensionService* service = static_cast<TestExtensionSystem*>(
+  ExtensionService* service = static_cast<extensions::TestExtensionSystem*>(
       ExtensionSystem::Get(profile.get()))->
       CreateExtensionService(
           command_line.get(),
@@ -4092,7 +4093,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
   recorder.set_ready(false);
   profile.reset(new TestingProfile());
   command_line->AppendSwitch(switches::kDisableExtensions);
-  service = static_cast<TestExtensionSystem*>(
+  service = static_cast<extensions::TestExtensionSystem*>(
       ExtensionSystem::Get(profile.get()))->
       CreateExtensionService(
           command_line.get(),
@@ -4106,7 +4107,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
   recorder.set_ready(false);
   profile.reset(new TestingProfile());
   profile->GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
-  service = static_cast<TestExtensionSystem*>(
+  service = static_cast<extensions::TestExtensionSystem*>(
       ExtensionSystem::Get(profile.get()))->
       CreateExtensionService(
           command_line.get(),
@@ -4121,7 +4122,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
   profile.reset(new TestingProfile());
   profile->GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
   command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
-  service = static_cast<TestExtensionSystem*>(
+  service = static_cast<extensions::TestExtensionSystem*>(
       ExtensionSystem::Get(profile.get()))->
       CreateExtensionService(
           command_line.get(),
diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h
index 3e15fd1..7658718 100644
--- a/chrome/browser/extensions/extension_service_unittest.h
+++ b/chrome/browser/extensions/extension_service_unittest.h
@@ -54,7 +54,7 @@ class ExtensionServiceTestBase : public testing::Test {
   scoped_ptr<TestingProfile> profile_;
   FilePath extensions_install_dir_;
   FilePath data_dir_;
-  // Managed by ExtensionSystemFactory.
+  // Managed by extensions::ExtensionSystemFactory.
   ExtensionService* service_;
   extensions::ManagementPolicy* management_policy_;
   size_t expected_extensions_count_;
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index 5d1dd19..bb39854 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -43,6 +43,8 @@
 
 using content::BrowserThread;
 
+namespace extensions {
+
 //
 // ExtensionSystem
 //
@@ -51,7 +53,7 @@ ExtensionSystem::ExtensionSystem() {
   // In lieu of a way for Feature to check whether it's running on the browser
   // process, tell it.
   // See http://crbug.com/126535.
-  extensions::Feature::SetChannelCheckingEnabled(true);
+  Feature::SetChannelCheckingEnabled(true);
 }
 
 ExtensionSystem::~ExtensionSystem() {
@@ -79,13 +81,13 @@ void ExtensionSystemImpl::Shared::InitPrefs() {
   bool extensions_disabled =
       profile_->GetPrefs()->GetBoolean(prefs::kDisableExtensions) ||
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableExtensions);
-  extension_prefs_.reset(new extensions::ExtensionPrefs(
+  extension_prefs_.reset(new ExtensionPrefs(
       profile_->GetPrefs(),
       profile_->GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
       ExtensionPrefValueMapFactory::GetForProfile(profile_)));
   extension_prefs_->Init(extensions_disabled);
 
-  state_store_.reset(new extensions::StateStore(
+  state_store_.reset(new StateStore(
       profile_,
       profile_->GetPath().AppendASCII(ExtensionService::kStateStoreName)));
 }
@@ -104,8 +106,7 @@ void ExtensionSystemImpl::Shared::InitInfoMap() {
 void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
-  lazy_background_task_queue_.reset(new extensions::LazyBackgroundTaskQueue(
-      profile_));
+  lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(profile_));
   extension_event_router_.reset(new ExtensionEventRouter(profile_));
   extension_message_service_.reset(new ExtensionMessageService(
       lazy_background_task_queue_.get()));
@@ -134,11 +135,10 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   // These services must be registered before the ExtensionService tries to
   // load any extensions.
   {
-    rules_registry_service_.reset(
-        new extensions::RulesRegistryService(profile_));
+    rules_registry_service_.reset(new RulesRegistryService(profile_));
     rules_registry_service_->RegisterDefaultRulesRegistries();
 
-    management_policy_.reset(new extensions::ManagementPolicy);
+    management_policy_.reset(new ManagementPolicy);
     RegisterManagementPolicyProviders();
   }
 
@@ -170,8 +170,8 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
       StringTokenizerT<CommandLine::StringType,
           CommandLine::StringType::const_iterator> t(path_list,
                                                      FILE_PATH_LITERAL(","));
-      scoped_refptr<extensions::UnpackedInstaller> installer =
-          extensions::UnpackedInstaller::Create(extension_service_.get());
+      scoped_refptr<UnpackedInstaller> installer =
+          UnpackedInstaller::Create(extension_service_.get());
       while (t.GetNext()) {
         installer->LoadFromCommandLine(FilePath(t.token()));
       }
@@ -204,7 +204,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   }
 }
 
-extensions::StateStore* ExtensionSystemImpl::Shared::state_store() {
+StateStore* ExtensionSystemImpl::Shared::state_store() {
   return state_store_.get();
 }
 
@@ -212,7 +212,7 @@ ExtensionService* ExtensionSystemImpl::Shared::extension_service() {
   return extension_service_.get();
 }
 
-extensions::ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() {
+ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() {
   return management_policy_.get();
 }
 
@@ -224,8 +224,8 @@ ExtensionInfoMap* ExtensionSystemImpl::Shared::info_map() {
   return extension_info_map_.get();
 }
 
-extensions::LazyBackgroundTaskQueue*
-ExtensionSystemImpl::Shared::lazy_background_task_queue() {
+LazyBackgroundTaskQueue*
+    ExtensionSystemImpl::Shared::lazy_background_task_queue() {
   return lazy_background_task_queue_.get();
 }
 
@@ -237,8 +237,7 @@ ExtensionEventRouter* ExtensionSystemImpl::Shared::event_router() {
   return extension_event_router_.get();
 }
 
-extensions::RulesRegistryService*
-ExtensionSystemImpl::Shared::rules_registry_service() {
+RulesRegistryService* ExtensionSystemImpl::Shared::rules_registry_service() {
   return rules_registry_service_.get();
 }
 
@@ -279,8 +278,8 @@ void ExtensionSystemImpl::Init(bool extensions_enabled) {
   shared_->InitInfoMap();
 
   extension_process_manager_.reset(ExtensionProcessManager::Create(profile_));
-  alarm_manager_.reset(new extensions::AlarmManager(profile_,
-                                                    &base::Time::Now));
+  alarm_manager_.reset(new AlarmManager(profile_,
+                                        &base::Time::Now));
 
   shared_->Init(extensions_enabled);
 }
@@ -289,7 +288,7 @@ ExtensionService* ExtensionSystemImpl::extension_service() {
   return shared_->extension_service();
 }
 
-extensions::ManagementPolicy* ExtensionSystemImpl::management_policy() {
+ManagementPolicy* ExtensionSystemImpl::management_policy() {
   return shared_->management_policy();
 }
 
@@ -307,11 +306,11 @@ ExtensionProcessManager* ExtensionSystemImpl::process_manager() {
   return extension_process_manager_.get();
 }
 
-extensions::AlarmManager* ExtensionSystemImpl::alarm_manager() {
+AlarmManager* ExtensionSystemImpl::alarm_manager() {
   return alarm_manager_.get();
 }
 
-extensions::StateStore* ExtensionSystemImpl::state_store() {
+StateStore* ExtensionSystemImpl::state_store() {
   return shared_->state_store();
 }
 
@@ -319,8 +318,7 @@ ExtensionInfoMap* ExtensionSystemImpl::info_map() {
   return shared_->info_map();
 }
 
-extensions::LazyBackgroundTaskQueue*
-ExtensionSystemImpl::lazy_background_task_queue() {
+LazyBackgroundTaskQueue* ExtensionSystemImpl::lazy_background_task_queue() {
   return shared_->lazy_background_task_queue();
 }
 
@@ -332,15 +330,14 @@ ExtensionEventRouter* ExtensionSystemImpl::event_router() {
   return shared_->event_router();
 }
 
-extensions::RulesRegistryService*
-ExtensionSystemImpl::rules_registry_service() {
+RulesRegistryService* ExtensionSystemImpl::rules_registry_service() {
   return shared_->rules_registry_service();
 }
 
 void ExtensionSystemImpl::RegisterExtensionWithRequestContexts(
-    const extensions::Extension* extension) {
+    const Extension* extension) {
   base::Time install_time;
-  if (extension->location() != extensions::Extension::COMPONENT) {
+  if (extension->location() != Extension::COMPONENT) {
     install_time = extension_service()->extension_prefs()->
         GetInstallTime(extension->id());
   }
@@ -361,3 +358,5 @@ void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
       base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(),
                  extension_id, reason));
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/extension_system.h b/chrome/browser/extensions/extension_system.h
index 8fedd38..c84f0ab 100644
--- a/chrome/browser/extensions/extension_system.h
+++ b/chrome/browser/extensions/extension_system.h
@@ -26,11 +26,11 @@ namespace extensions {
 class AlarmManager;
 class Extension;
 class ExtensionPrefs;
+class ExtensionSystemSharedFactory;
 class LazyBackgroundTaskQueue;
 class ManagementPolicy;
 class RulesRegistryService;
 class StateStore;
-}
 
 // The ExtensionSystem manages the creation and destruction of services
 // related to extensions. Most objects are shared between normal
@@ -60,7 +60,7 @@ class ExtensionSystem : public ProfileKeyedService {
   // The class controlling whether users are permitted to perform certain
   // actions on extensions (install, uninstall, disable, etc.).
   // The ManagementPolicy is created at startup.
-  virtual extensions::ManagementPolicy* management_policy() = 0;
+  virtual ManagementPolicy* management_policy() = 0;
 
   //  The ExtensionDevToolsManager is created at startup.
   virtual ExtensionDevToolsManager* devtools_manager() = 0;
@@ -72,16 +72,16 @@ class ExtensionSystem : public ProfileKeyedService {
   virtual ExtensionProcessManager* process_manager() = 0;
 
   // The AlarmManager is created at startup.
-  virtual extensions::AlarmManager* alarm_manager() = 0;
+  virtual AlarmManager* alarm_manager() = 0;
 
   // The StateStore is created at startup.
-  virtual extensions::StateStore* state_store() = 0;
+  virtual StateStore* state_store() = 0;
 
   // Returns the IO-thread-accessible extension data.
   virtual ExtensionInfoMap* info_map() = 0;
 
   // The LazyBackgroundTaskQueue is created at startup.
-  virtual extensions::LazyBackgroundTaskQueue* lazy_background_task_queue() = 0;
+  virtual LazyBackgroundTaskQueue* lazy_background_task_queue() = 0;
 
   // The ExtensionMessageService is created at startup.
   virtual ExtensionMessageService* message_service() = 0;
@@ -90,7 +90,7 @@ class ExtensionSystem : public ProfileKeyedService {
   virtual ExtensionEventRouter* event_router() = 0;
 
   // The RulesRegistryService is created at startup.
-  virtual extensions::RulesRegistryService* rules_registry_service() = 0;
+  virtual RulesRegistryService* rules_registry_service() = 0;
 
   // Called by the ExtensionService that lives in this system. Gives the
   // info map a chance to react to the load event before the EXTENSION_LOADED
@@ -98,7 +98,7 @@ class ExtensionSystem : public ProfileKeyedService {
   // avoid race conditions by making sure URLRequestContexts learn about new
   // extensions before anything else needs them to know.
   virtual void RegisterExtensionWithRequestContexts(
-      const extensions::Extension* extension) {}
+      const Extension* extension) {}
 
   // Called by the ExtensionService that lives in this system. Lets the
   // info map clean up its RequestContexts once all the listeners to the
@@ -124,23 +124,23 @@ class ExtensionSystemImpl : public ExtensionSystem {
   virtual void Init(bool extensions_enabled) OVERRIDE;
 
   virtual ExtensionService* extension_service() OVERRIDE;  // shared
-  virtual extensions::ManagementPolicy* management_policy() OVERRIDE;  // shared
+  virtual ManagementPolicy* management_policy() OVERRIDE;  // shared
   virtual UserScriptMaster* user_script_master() OVERRIDE;  // shared
   virtual ExtensionDevToolsManager* devtools_manager() OVERRIDE;
   virtual ExtensionProcessManager* process_manager() OVERRIDE;
-  virtual extensions::AlarmManager* alarm_manager() OVERRIDE;
-  virtual extensions::StateStore* state_store() OVERRIDE;
-  virtual extensions::LazyBackgroundTaskQueue* lazy_background_task_queue()
+  virtual AlarmManager* alarm_manager() OVERRIDE;
+  virtual StateStore* state_store() OVERRIDE;
+  virtual LazyBackgroundTaskQueue* lazy_background_task_queue()
       OVERRIDE;  // shared
   virtual ExtensionInfoMap* info_map() OVERRIDE;  // shared
   virtual ExtensionMessageService* message_service() OVERRIDE;  // shared
   virtual ExtensionEventRouter* event_router() OVERRIDE;  // shared
   // The RulesRegistryService is created at startup.
-  virtual extensions::RulesRegistryService* rules_registry_service()
+  virtual RulesRegistryService* rules_registry_service()
       OVERRIDE;  // shared
 
   virtual void RegisterExtensionWithRequestContexts(
-      const extensions::Extension* extension) OVERRIDE;
+      const Extension* extension) OVERRIDE;
 
   virtual void UnregisterExtensionWithRequestContexts(
       const std::string& extension_id,
@@ -163,35 +163,35 @@ class ExtensionSystemImpl : public ExtensionSystem {
     void InitInfoMap();
     void Init(bool extensions_enabled);
 
-    extensions::StateStore* state_store();
+    StateStore* state_store();
     ExtensionService* extension_service();
-    extensions::ManagementPolicy* management_policy();
+    ManagementPolicy* management_policy();
     UserScriptMaster* user_script_master();
     ExtensionInfoMap* info_map();
-    extensions::LazyBackgroundTaskQueue* lazy_background_task_queue();
+    LazyBackgroundTaskQueue* lazy_background_task_queue();
     ExtensionMessageService* message_service();
     ExtensionEventRouter* event_router();
-    extensions::RulesRegistryService* rules_registry_service();
+    RulesRegistryService* rules_registry_service();
 
    private:
     Profile* profile_;
 
     // The services that are shared between normal and incognito profiles.
 
-    scoped_ptr<extensions::StateStore> state_store_;
-    scoped_ptr<extensions::ExtensionPrefs> extension_prefs_;
+    scoped_ptr<StateStore> state_store_;
+    scoped_ptr<ExtensionPrefs> extension_prefs_;
     // ExtensionService depends on the 2 above.
     scoped_ptr<ExtensionService> extension_service_;
-    scoped_ptr<extensions::ManagementPolicy> management_policy_;
+    scoped_ptr<ManagementPolicy> management_policy_;
     scoped_refptr<UserScriptMaster> user_script_master_;
     // extension_info_map_ needs to outlive extension_process_manager_.
     scoped_refptr<ExtensionInfoMap> extension_info_map_;
     // This is a dependency of ExtensionMessageService and ExtensionEventRouter.
-    scoped_ptr<extensions::LazyBackgroundTaskQueue> lazy_background_task_queue_;
+    scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_;
     scoped_ptr<ExtensionMessageService> extension_message_service_;
     scoped_ptr<ExtensionEventRouter> extension_event_router_;
     scoped_ptr<ExtensionNavigationObserver> extension_navigation_observer_;
-    scoped_ptr<extensions::RulesRegistryService> rules_registry_service_;
+    scoped_ptr<RulesRegistryService> rules_registry_service_;
   };
 
   Profile* profile_;
@@ -205,9 +205,11 @@ class ExtensionSystemImpl : public ExtensionSystem {
   // incoming resource requests from extension processes and those require
   // access to the ResourceContext owned by |io_data_|.
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
-  scoped_ptr<extensions::AlarmManager> alarm_manager_;
+  scoped_ptr<AlarmManager> alarm_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
 };
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_
diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc
index 8d162ed..84458c4 100644
--- a/chrome/browser/extensions/extension_system_factory.cc
+++ b/chrome/browser/extensions/extension_system_factory.cc
@@ -14,11 +14,13 @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 
+namespace extensions {
+
 // ExtensionSystemSharedFactory
 
 // static
-ExtensionSystemImpl::Shared* ExtensionSystemSharedFactory::GetForProfile(
-    Profile* profile) {
+ExtensionSystemImpl::Shared*
+ExtensionSystemSharedFactory::GetForProfile(Profile* profile) {
   return static_cast<ExtensionSystemImpl::Shared*>(
       GetInstance()->GetServiceForProfile(profile, true));
 }
@@ -89,3 +91,5 @@ bool ExtensionSystemFactory::ServiceHasOwnInstanceInIncognito() {
 bool ExtensionSystemFactory::ServiceIsCreatedWithProfile() {
   return true;
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/extension_system_factory.h b/chrome/browser/extensions/extension_system_factory.h
index 7a19ee5..2471a25 100644
--- a/chrome/browser/extensions/extension_system_factory.h
+++ b/chrome/browser/extensions/extension_system_factory.h
@@ -9,15 +9,18 @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
-class ExtensionSystem;
 class Profile;
 class ProfileKeyedService;
 
+namespace extensions {
+class ExtensionSystem;
+
 // ProfileKeyedServiceFactory for ExtensionSystemImpl::Shared.
 // Should not be used except by ExtensionSystem(Factory).
 class ExtensionSystemSharedFactory : public ProfileKeyedServiceFactory {
  public:
-  static ExtensionSystemImpl::Shared* GetForProfile(Profile* profile);
+  static ExtensionSystemImpl::Shared* GetForProfile(
+      Profile* profile);
 
   static ExtensionSystemSharedFactory* GetInstance();
 
@@ -52,4 +55,6 @@ class ExtensionSystemFactory : public ProfileKeyedServiceFactory {
   virtual bool ServiceIsCreatedWithProfile() OVERRIDE;
 };
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_FACTORY_H_
diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc
index 2271b17..465fe45 100644
--- a/chrome/browser/extensions/extension_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_ui_unittest.cc
@@ -28,8 +28,9 @@ class ExtensionUITest : public testing::Test {
   void SetUp() {
     // Create an ExtensionService and ManagementPolicy to inject into the
     // ExtensionSettingsHandler.
-    TestExtensionSystem* system = static_cast<TestExtensionSystem*>(
-        ExtensionSystem::Get(&profile_));
+    extensions::TestExtensionSystem* system =
+        static_cast<extensions::TestExtensionSystem*>(
+            extensions::ExtensionSystem::Get(&profile_));
     extension_service_ = system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), FilePath(), false);
     management_policy_ = system->CreateManagementPolicy();
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index 3ec5d13..83617a4 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -93,7 +93,7 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) {
 
   // Check policy on every load in case an extension was blacklisted while
   // Chrome was not running.
-  const ManagementPolicy* policy = ExtensionSystem::Get(
+  const ManagementPolicy* policy = extensions::ExtensionSystem::Get(
       extension_service_->profile())->management_policy();
   if (extension &&
       !policy->UserMayLoad(extension, NULL)) {
diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc
index 1ec3480..b16abde 100644
--- a/chrome/browser/extensions/menu_manager.cc
+++ b/chrome/browser/extensions/menu_manager.cc
@@ -31,6 +31,7 @@
 #include "ui/gfx/favicon_size.h"
 
 using content::WebContents;
+using extensions::ExtensionSystem;
 
 namespace extensions {
 
diff --git a/chrome/browser/extensions/platform_app_launcher.cc b/chrome/browser/extensions/platform_app_launcher.cc
index 3d798a1..a02a0d3 100644
--- a/chrome/browser/extensions/platform_app_launcher.cc
+++ b/chrome/browser/extensions/platform_app_launcher.cc
@@ -30,6 +30,7 @@
 
 using content::BrowserThread;
 using extensions::Extension;
+using extensions::ExtensionSystem;
 
 namespace {
 
diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc
index d1d5e96..fddcff9 100644
--- a/chrome/browser/extensions/script_badge_controller.cc
+++ b/chrome/browser/extensions/script_badge_controller.cc
@@ -82,7 +82,8 @@ void ScriptBadgeController::OnExecuteScriptFinished(
 }
 
 ExtensionService* ScriptBadgeController::GetExtensionService() {
-  return ExtensionSystem::Get(tab_contents_->profile())->extension_service();
+  return extensions::ExtensionSystem::Get(
+      tab_contents_->profile())->extension_service();
 }
 
 int32 ScriptBadgeController::GetPageID() {
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc
index a129702..e3f6e25 100644
--- a/chrome/browser/extensions/test_extension_system.cc
+++ b/chrome/browser/extensions/test_extension_system.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/value_store/testing_value_store.h"
 #include "chrome/common/chrome_switches.h"
 
+namespace extensions {
 
 TestExtensionSystem::TestExtensionSystem(Profile* profile)
     : profile_(profile),
@@ -38,8 +39,8 @@ void TestExtensionSystem::CreateExtensionProcessManager() {
 }
 
 void TestExtensionSystem::CreateAlarmManager(
-    extensions::AlarmManager::TimeProvider now) {
-  alarm_manager_.reset(new extensions::AlarmManager(profile_, now));
+    AlarmManager::TimeProvider now) {
+  alarm_manager_.reset(new AlarmManager(profile_, now));
 }
 
 ExtensionService* TestExtensionSystem::CreateExtensionService(
@@ -54,13 +55,11 @@ ExtensionService* TestExtensionSystem::CreateExtensionService(
   // are not reflected in the pref service. One would need to
   // inject a new ExtensionPrefStore(extension_pref_value_map, false).
 
-  extension_prefs_.reset(new extensions::ExtensionPrefs(
+  extension_prefs_.reset(new ExtensionPrefs(
       profile_->GetPrefs(),
       install_directory,
       ExtensionPrefValueMapFactory::GetForProfile(profile_)));
-  state_store_.reset(new extensions::StateStore(
-      profile_,
-      new TestingValueStore()));
+  state_store_.reset(new StateStore(profile_, new TestingValueStore()));
   extension_prefs_->Init(extensions_disabled);
   extension_service_.reset(new ExtensionService(profile_,
                                                 command_line,
@@ -72,8 +71,8 @@ ExtensionService* TestExtensionSystem::CreateExtensionService(
   return extension_service_.get();
 }
 
-extensions::ManagementPolicy* TestExtensionSystem::CreateManagementPolicy() {
-  management_policy_.reset(new extensions::ManagementPolicy());
+ManagementPolicy* TestExtensionSystem::CreateManagementPolicy() {
+  management_policy_.reset(new ManagementPolicy());
   DCHECK(extension_prefs_.get());
   management_policy_->RegisterProvider(extension_prefs_.get());
 
@@ -84,7 +83,7 @@ ExtensionService* TestExtensionSystem::extension_service() {
   return extension_service_.get();
 }
 
-extensions::ManagementPolicy* TestExtensionSystem::management_policy() {
+ManagementPolicy* TestExtensionSystem::management_policy() {
   return management_policy_.get();
 }
 
@@ -104,11 +103,11 @@ ExtensionProcessManager* TestExtensionSystem::process_manager() {
   return extension_process_manager_.get();
 }
 
-extensions::AlarmManager* TestExtensionSystem::alarm_manager() {
+AlarmManager* TestExtensionSystem::alarm_manager() {
   return alarm_manager_.get();
 }
 
-extensions::StateStore* TestExtensionSystem::state_store() {
+StateStore* TestExtensionSystem::state_store() {
   return state_store_.get();
 }
 
@@ -116,7 +115,7 @@ ExtensionInfoMap* TestExtensionSystem::info_map() {
   return info_map_.get();
 }
 
-extensions::LazyBackgroundTaskQueue*
+LazyBackgroundTaskQueue*
 TestExtensionSystem::lazy_background_task_queue() {
   return NULL;
 }
@@ -129,8 +128,7 @@ ExtensionEventRouter* TestExtensionSystem::event_router() {
   return NULL;
 }
 
-extensions::RulesRegistryService*
-TestExtensionSystem::rules_registry_service() {
+RulesRegistryService* TestExtensionSystem::rules_registry_service() {
   return NULL;
 }
 
@@ -138,3 +136,5 @@ TestExtensionSystem::rules_registry_service() {
 ProfileKeyedService* TestExtensionSystem::Build(Profile* profile) {
   return new TestExtensionSystem(profile);
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h
index 3586155..3870e2d 100644
--- a/chrome/browser/extensions/test_extension_system.h
+++ b/chrome/browser/extensions/test_extension_system.h
@@ -13,6 +13,8 @@ namespace base {
 class Time;
 }
 
+namespace extensions {
+
 // Test ExtensionSystem, for use with TestingProfile.
 class TestExtensionSystem : public ExtensionSystem {
  public:
@@ -30,7 +32,7 @@ class TestExtensionSystem : public ExtensionSystem {
 
   // Creates and returns a ManagementPolicy with the ExtensionService and
   // ExtensionPrefs registered. If not invoked, the ManagementPolicy is NULL.
-  extensions::ManagementPolicy* CreateManagementPolicy();
+  ManagementPolicy* CreateManagementPolicy();
 
   // Creates an ExtensionProcessManager. If not invoked, the
   // ExtensionProcessManager is NULL.
@@ -41,19 +43,19 @@ class TestExtensionSystem : public ExtensionSystem {
 
   virtual void Init(bool extensions_enabled) OVERRIDE {}
   virtual ExtensionService* extension_service() OVERRIDE;
-  virtual extensions::ManagementPolicy* management_policy() OVERRIDE;
+  virtual ManagementPolicy* management_policy() OVERRIDE;
   void SetExtensionService(ExtensionService* service);
   virtual UserScriptMaster* user_script_master() OVERRIDE;
   virtual ExtensionDevToolsManager* devtools_manager() OVERRIDE;
   virtual ExtensionProcessManager* process_manager() OVERRIDE;
-  virtual extensions::AlarmManager* alarm_manager() OVERRIDE;
-  virtual extensions::StateStore* state_store() OVERRIDE;
+  virtual AlarmManager* alarm_manager() OVERRIDE;
+  virtual StateStore* state_store() OVERRIDE;
   virtual ExtensionInfoMap* info_map() OVERRIDE;
-  virtual extensions::LazyBackgroundTaskQueue*
+  virtual LazyBackgroundTaskQueue*
       lazy_background_task_queue() OVERRIDE;
   virtual ExtensionMessageService* message_service() OVERRIDE;
   virtual ExtensionEventRouter* event_router() OVERRIDE;
-  virtual extensions::RulesRegistryService* rules_registry_service()
+  virtual RulesRegistryService* rules_registry_service()
       OVERRIDE;
 
   // Factory method for tests to use with SetTestingProfile.
@@ -64,13 +66,15 @@ class TestExtensionSystem : public ExtensionSystem {
 
   // The Extension Preferences. Only created if CreateExtensionService is
   // invoked.
-  scoped_ptr<extensions::ExtensionPrefs> extension_prefs_;
-  scoped_ptr<extensions::StateStore> state_store_;
+  scoped_ptr<ExtensionPrefs> extension_prefs_;
+  scoped_ptr<StateStore> state_store_;
   scoped_ptr<ExtensionService> extension_service_;
-  scoped_ptr<extensions::ManagementPolicy> management_policy_;
+  scoped_ptr<ManagementPolicy> management_policy_;
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
-  scoped_ptr<extensions::AlarmManager> alarm_manager_;
+  scoped_ptr<AlarmManager> alarm_manager_;
   scoped_refptr<ExtensionInfoMap> info_map_;
 };
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_
diff --git a/chrome/browser/intents/web_intents_registry_factory.cc b/chrome/browser/intents/web_intents_registry_factory.cc
index 7bbbdb4..5a020c4 100644
--- a/chrome/browser/intents/web_intents_registry_factory.cc
+++ b/chrome/browser/intents/web_intents_registry_factory.cc
@@ -21,7 +21,7 @@ WebIntentsRegistryFactory::WebIntentsRegistryFactory()
     : ProfileKeyedServiceFactory("WebIntentsRegistry",
                                  ProfileDependencyManager::GetInstance()) {
   DependsOn(WebDataServiceFactory::GetInstance());
-  DependsOn(ExtensionSystemFactory::GetInstance());
+  DependsOn(extensions::ExtensionSystemFactory::GetInstance());
 }
 
 WebIntentsRegistryFactory::~WebIntentsRegistryFactory() {
diff --git a/chrome/browser/managed_mode.cc b/chrome/browser/managed_mode.cc
index 259882f..e9740520 100644
--- a/chrome/browser/managed_mode.cc
+++ b/chrome/browser/managed_mode.cc
@@ -250,11 +250,11 @@ void ManagedMode::SetInManagedMode(Profile* newly_managed_profile) {
   // so pref observers see the correct ManagedMode state.
   if (newly_managed_profile) {
     DCHECK(!managed_profile_ || managed_profile_ == newly_managed_profile);
-    ExtensionSystem::Get(
+    extensions::ExtensionSystem::Get(
         newly_managed_profile)->management_policy()->RegisterProvider(this);
     g_browser_process->local_state()->SetBoolean(prefs::kInManagedMode, true);
   } else {
-    ExtensionSystem::Get(
+    extensions::ExtensionSystem::Get(
         managed_profile_)->management_policy()->UnregisterProvider(this);
     g_browser_process->local_state()->SetBoolean(prefs::kInManagedMode, false);
   }
diff --git a/chrome/browser/prerender/prerender_manager_factory.cc b/chrome/browser/prerender/prerender_manager_factory.cc
index 61ac573..dab3ee1 100644
--- a/chrome/browser/prerender/prerender_manager_factory.cc
+++ b/chrome/browser/prerender/prerender_manager_factory.cc
@@ -34,7 +34,7 @@ PrerenderManagerFactory* PrerenderManagerFactory::GetInstance() {
 PrerenderManagerFactory::PrerenderManagerFactory()
     : ProfileKeyedServiceFactory("PrerenderManager",
                                  ProfileDependencyManager::GetInstance()) {
-  DependsOn(ExtensionSystemFactory::GetInstance());
+  DependsOn(extensions::ExtensionSystemFactory::GetInstance());
 }
 
 PrerenderManagerFactory::~PrerenderManagerFactory() {
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index ace07a5..90359cf 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -120,7 +120,7 @@ OffTheRecordProfileImpl::~OffTheRecordProfileImpl() {
     io_data_.GetResourceContextNoInit());
 
   ExtensionService* extension_service =
-      ExtensionSystem::Get(this)->extension_service();
+      extensions::ExtensionSystem::Get(this)->extension_service();
   if (extension_service && extension_service->extensions_enabled()) {
     extension_service->extension_prefs()->
         ClearIncognitoSessionOnlyContentSettings();
@@ -191,20 +191,20 @@ VisitedLinkMaster* OffTheRecordProfileImpl::GetVisitedLinkMaster() {
 }
 
 ExtensionService* OffTheRecordProfileImpl::GetExtensionService() {
-  return ExtensionSystem::Get(this)->extension_service();
+  return extensions::ExtensionSystem::Get(this)->extension_service();
 }
 
 UserScriptMaster* OffTheRecordProfileImpl::GetUserScriptMaster() {
-  return ExtensionSystem::Get(this)->user_script_master();
+  return extensions::ExtensionSystem::Get(this)->user_script_master();
 }
 
 ExtensionProcessManager*
     OffTheRecordProfileImpl::GetExtensionProcessManager() {
-  return ExtensionSystem::Get(this)->process_manager();
+  return extensions::ExtensionSystem::Get(this)->process_manager();
 }
 
 ExtensionEventRouter* OffTheRecordProfileImpl::GetExtensionEventRouter() {
-  return ExtensionSystem::Get(this)->event_router();
+  return extensions::ExtensionSystem::Get(this)->event_router();
 }
 
 ExtensionSpecialStoragePolicy*
diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc
index 63128bc..e35836e 100644
--- a/chrome/browser/profiles/profile_dependency_manager.cc
+++ b/chrome/browser/profiles/profile_dependency_manager.cc
@@ -207,7 +207,7 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
   DownloadServiceFactory::GetInstance();
   extensions::CommandServiceFactory::GetInstance();
   extensions::SuggestedLinksRegistryFactory::GetInstance();
-  ExtensionSystemFactory::GetInstance();
+  extensions::ExtensionSystemFactory::GetInstance();
   FindBarStateFactory::GetInstance();
 #if defined(USE_AURA)
   GesturePrefsObserverFactoryAura::GetInstance();
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index d77edf8..35bb58f 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -606,19 +606,19 @@ VisitedLinkMaster* ProfileImpl::GetVisitedLinkMaster() {
 }
 
 ExtensionService* ProfileImpl::GetExtensionService() {
-  return ExtensionSystem::Get(this)->extension_service();
+  return extensions::ExtensionSystem::Get(this)->extension_service();
 }
 
 UserScriptMaster* ProfileImpl::GetUserScriptMaster() {
-  return ExtensionSystem::Get(this)->user_script_master();
+  return extensions::ExtensionSystem::Get(this)->user_script_master();
 }
 
 ExtensionProcessManager* ProfileImpl::GetExtensionProcessManager() {
-  return ExtensionSystem::Get(this)->process_manager();
+  return extensions::ExtensionSystem::Get(this)->process_manager();
 }
 
 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() {
-  return ExtensionSystem::Get(this)->event_router();
+  return extensions::ExtensionSystem::Get(this)->event_router();
 }
 
 ExtensionSpecialStoragePolicy*
@@ -714,7 +714,7 @@ net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess(
     int renderer_child_id) {
   ExtensionService* extension_service =
-      ExtensionSystem::Get(this)->extension_service();
+      extensions::ExtensionSystem::Get(this)->extension_service();
   if (extension_service) {
     const extensions::Extension* installed_app = extension_service->
         GetInstalledAppForRenderer(renderer_child_id);
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
index a9563b7..f7fb934 100644
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
@@ -21,7 +21,6 @@
 #include "content/public/browser/notification_registrar.h"
 
 class ExtensionNavigationObserver;
-class ExtensionSystem;
 class NetPrefObserver;
 class PrefService;
 class SSLConfigServiceManager;
@@ -43,6 +42,10 @@ namespace content {
 class SpeechRecognitionPreferences;
 }
 
+namespace extensions {
+class ExtensionSystem;
+}
+
 // The default profile implementation.
 class ProfileImpl : public Profile,
                     public content::NotificationObserver {
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 678457d..2861e3e 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -199,7 +199,7 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   params->cookie_monster_delegate =
       new ChromeCookieMonsterDelegate(profile_getter);
   params->extension_info_map =
-      ExtensionSystem::Get(profile)->info_map();
+      extensions::ExtensionSystem::Get(profile)->info_map();
 
   if (predictors::ResourcePrefetchPredictor* predictor =
           predictors::ResourcePrefetchPredictorFactory::GetForProfile(
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 94564be..5e10d3b 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -659,12 +659,12 @@ void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
 void ProfileManager::DoFinalInitForServices(Profile* profile,
                                             bool go_off_the_record) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  ExtensionSystem::Get(profile)->Init(!go_off_the_record);
+  extensions::ExtensionSystem::Get(profile)->Init(!go_off_the_record);
   // During tests, when |profile| is an instance of TestingProfile,
   // ExtensionSystem might not create an ExtensionService.
-  if (ExtensionSystem::Get(profile)->extension_service()) {
+  if (extensions::ExtensionSystem::Get(profile)->extension_service()) {
     profile->GetHostContentSettingsMap()->RegisterExtensionService(
-        ExtensionSystem::Get(profile)->extension_service());
+        extensions::ExtensionSystem::Get(profile)->extension_service());
   }
   if (!command_line.HasSwitch(switches::kDisableWebResources))
     profile->InitPromoResources();
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index cb1855b..6ca69d6 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -59,7 +59,8 @@ ChromeRenderMessageFilter::ChromeRenderMessageFilter(
       profile_(profile),
       off_the_record_(profile_->IsOffTheRecord()),
       request_context_(request_context),
-      extension_info_map_(ExtensionSystem::Get(profile)->info_map()),
+      extension_info_map_(
+          extensions::ExtensionSystem::Get(profile)->info_map()),
       cookie_settings_(CookieSettings::Factory::GetForProfile(profile)),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
@@ -282,7 +283,7 @@ void ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread(
     const std::string& target_extension_id,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ExtensionSystem::Get(profile_)->message_service()->
+  extensions::ExtensionSystem::Get(profile_)->message_service()->
       OpenChannelToExtension(
           source_process_id, source_routing_id, receiver_port_id,
           source_extension_id, target_extension_id, channel_name);
@@ -308,7 +309,7 @@ void ChromeRenderMessageFilter::OpenChannelToTabOnUIThread(
     const std::string& extension_id,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ExtensionSystem::Get(profile_)->message_service()->
+  extensions::ExtensionSystem::Get(profile_)->message_service()->
       OpenChannelToTab(
           source_process_id, source_routing_id, receiver_port_id,
           tab_id, extension_id, channel_name);
@@ -422,7 +423,7 @@ void ChromeRenderMessageFilter::OnExtensionCloseChannel(int port_id,
     return;  // To guard against crash in browser_tests shutdown.
 
   ExtensionMessageService* message_service =
-      ExtensionSystem::Get(profile_)->message_service();
+      extensions::ExtensionSystem::Get(profile_)->message_service();
   if (message_service)
     message_service->CloseChannel(port_id, connection_error);
 }
diff --git a/chrome/browser/speech/speech_input_extension_manager.cc b/chrome/browser/speech/speech_input_extension_manager.cc
index 93c4a80..7ca1cf7 100644
--- a/chrome/browser/speech/speech_input_extension_manager.cc
+++ b/chrome/browser/speech/speech_input_extension_manager.cc
@@ -253,7 +253,7 @@ void SpeechInputExtensionManager::ResetToIdleState() {
 int SpeechInputExtensionManager::GetRenderProcessIDForExtension(
     const std::string& extension_id) const {
   ExtensionProcessManager* epm =
-      ExtensionSystem::Get(profile_)->process_manager();
+      extensions::ExtensionSystem::Get(profile_)->process_manager();
   DCHECK(epm);
   ExtensionHost* eh = epm->GetBackgroundHostForExtension(extension_id);
   DCHECK(eh);
diff --git a/chrome/browser/sync/glue/extension_data_type_controller.cc b/chrome/browser/sync/glue/extension_data_type_controller.cc
index 398613a..599e741 100644
--- a/chrome/browser/sync/glue/extension_data_type_controller.cc
+++ b/chrome/browser/sync/glue/extension_data_type_controller.cc
@@ -26,7 +26,7 @@ ExtensionDataTypeController::ExtensionDataTypeController(
 ExtensionDataTypeController::~ExtensionDataTypeController() {}
 
 bool ExtensionDataTypeController::StartModels() {
-  ExtensionSystem::Get(profile_)->Init(true);
+  extensions::ExtensionSystem::Get(profile_)->Init(true);
   return true;
 }
 
diff --git a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
index 1170277..2df76b9 100644
--- a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
+++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
@@ -53,7 +53,7 @@ bool ExtensionSettingDataTypeController::PostTaskOnBackendThread(
 
 bool ExtensionSettingDataTypeController::StartModels() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ExtensionSystem::Get(profile_)->Init(true);
+  extensions::ExtensionSystem::Get(profile_)->Init(true);
   return true;
 }
 
diff --git a/chrome/browser/sync/glue/theme_data_type_controller.cc b/chrome/browser/sync/glue/theme_data_type_controller.cc
index a89324c..7133805 100644
--- a/chrome/browser/sync/glue/theme_data_type_controller.cc
+++ b/chrome/browser/sync/glue/theme_data_type_controller.cc
@@ -27,7 +27,7 @@ syncer::ModelType ThemeDataTypeController::type() const {
 ThemeDataTypeController::~ThemeDataTypeController() {}
 
 bool ThemeDataTypeController::StartModels() {
-  ExtensionSystem::Get(profile_)->Init(true);
+  extensions::ExtensionSystem::Get(profile_)->Init(true);
   return true;
 }
 
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 6a080a2..15047b0 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -88,7 +88,7 @@ ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
     : profile_(profile),
       command_line_(command_line),
       extension_system_(
-          ExtensionSystemFactory::GetForProfile(profile)),
+          extensions::ExtensionSystemFactory::GetForProfile(profile)),
       web_data_service_(WebDataServiceFactory::GetForProfile(
           profile_, Profile::IMPLICIT_ACCESS)) {
 }
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.h b/chrome/browser/sync/profile_sync_components_factory_impl.h
index ec7a46a..241cc8f 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.h
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.h
@@ -13,9 +13,12 @@
 #include "chrome/browser/webdata/web_data_service.h"
 
 class CommandLine;
-class ExtensionSystem;
 class Profile;
 
+namespace extensions {
+class ExtensionSystem;
+}
+
 class ProfileSyncComponentsFactoryImpl : public ProfileSyncComponentsFactory {
  public:
   ProfileSyncComponentsFactoryImpl(Profile* profile,
@@ -63,9 +66,10 @@ class ProfileSyncComponentsFactoryImpl : public ProfileSyncComponentsFactory {
  private:
   Profile* profile_;
   CommandLine* command_line_;
-  // Set on the UI thread (since ExtensionSystemFactory is non-threadsafe);
-  // accessed on both the UI and FILE threads in GetSyncableServiceForType.
-  ExtensionSystem* extension_system_;
+  // Set on the UI thread (since extensions::ExtensionSystemFactory is
+  // non-threadsafe); accessed on both the UI and FILE threads in
+  // GetSyncableServiceForType.
+  extensions::ExtensionSystem* extension_system_;
   scoped_refptr<WebDataService> web_data_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncComponentsFactoryImpl);
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index e3f5402..5bddce8 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -56,7 +56,7 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory()
   DependsOn(GlobalErrorServiceFactory::GetInstance());
   DependsOn(SigninManagerFactory::GetInstance());
   DependsOn(PasswordStoreFactory::GetInstance());
-  DependsOn(ExtensionSystemFactory::GetInstance());
+  DependsOn(extensions::ExtensionSystemFactory::GetInstance());
   DependsOn(WebDataServiceFactory::GetInstance());
   DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(BookmarkModelFactory::GetInstance());
diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc
index 8691b23..a771c59 100644
--- a/chrome/browser/sync/test/integration/sync_app_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_app_helper.cc
@@ -93,9 +93,9 @@ void SyncAppHelper::SetupIfNecessary(SyncTest* test) {
     return;
 
   for (int i = 0; i < test->num_clients(); ++i) {
-    ExtensionSystem::Get(test->GetProfile(i))->Init(true);
+    extensions::ExtensionSystem::Get(test->GetProfile(i))->Init(true);
   }
-  ExtensionSystem::Get(test->verifier())->Init(true);
+  extensions::ExtensionSystem::Get(test->verifier())->Init(true);
 
   setup_completed_ = true;
 }
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index a2151ac..a353abf 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -242,7 +242,7 @@ bool SyncExtensionHelper::ExtensionStatesMatch(
 }
 
 void SyncExtensionHelper::SetupProfile(Profile* profile) {
-  ExtensionSystem::Get(profile)->Init(true);
+  extensions::ExtensionSystem::Get(profile)->Init(true);
   profile_extensions_.insert(make_pair(profile, ExtensionNameMap()));
 }
 
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index bf682e0..9ff2c16 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -637,7 +637,8 @@ void RenderViewContextMenu::InitMenu() {
 }
 
 const Extension* RenderViewContextMenu::GetExtension() const {
-  ExtensionSystem* system = ExtensionSystem::Get(profile_);
+  extensions::ExtensionSystem* system =
+      extensions::ExtensionSystem::Get(profile_);
   // There is no process manager in some tests.
   if (!system->process_manager())
     return NULL;
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index 4dc1de5..a6f4b11 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -1187,7 +1187,7 @@ const Extension* TaskManagerExtensionProcessResource::GetExtension() const {
   Profile* profile = Profile::FromBrowserContext(
       render_view_host_->GetProcess()->GetBrowserContext());
   ExtensionProcessManager* process_manager =
-      ExtensionSystem::Get(profile)->process_manager();
+      extensions::ExtensionSystem::Get(profile)->process_manager();
   return process_manager->GetExtensionForRenderViewHost(render_view_host_);
 }
 
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index a6fa7a3..ce72252 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -1348,8 +1348,8 @@ TEST_F(TranslateManagerTest, BeforeTranslateExtraButtons) {
   TranslateInfoBarDelegate* infobar;
   TestingProfile* test_profile =
       static_cast<TestingProfile*>(contents()->GetBrowserContext());
-  static_cast<TestExtensionSystem*>(
-      ExtensionSystem::Get(test_profile))->
+  static_cast<extensions::TestExtensionSystem*>(
+      extensions::ExtensionSystem::Get(test_profile))->
       CreateExtensionProcessManager();
   test_profile->set_incognito(true);
   for (int i = 0; i < 8; ++i) {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 1193f89..92d4f68 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -275,8 +275,8 @@ class BookmarkBarControllerTestBase : public CocoaProfileTest {
     ASSERT_TRUE(profile());
 
     FilePath extension_dir;
-    static_cast<TestExtensionSystem*>(
-        ExtensionSystem::Get(profile()))->
+    static_cast<extensions::TestExtensionSystem*>(
+        extensions::ExtensionSystem::Get(profile()))->
         CreateExtensionService(
             CommandLine::ForCurrentProcess(),
             extension_dir, false);
diff --git a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
index edccff1..3a6f31c 100644
--- a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc
@@ -226,8 +226,8 @@ bool ExtensionAppItem::IsCommandIdEnabled(int command_id) const {
         !extension->options_url().is_empty();
   } else if (command_id == UNINSTALL) {
     const Extension* extension = GetExtension();
-    const extensions::ManagementPolicy* policy = ExtensionSystem::Get(
-        profile_)->management_policy();
+    const extensions::ManagementPolicy* policy =
+        extensions::ExtensionSystem::Get(profile_)->management_policy();
     return extension &&
            policy->UserMayModifySettings(extension, NULL);
   }
diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc
index f24c602..693882d 100644
--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -36,8 +36,9 @@ class ChromeLauncherControllerTest : public testing::Test {
     manifest.SetString("version", "1");
     manifest.SetString("description", "for testing pinned apps");
 
-    TestExtensionSystem* extension_system(
-        static_cast<TestExtensionSystem*>(ExtensionSystem::Get(&profile_)));
+    extensions::TestExtensionSystem* extension_system(
+        static_cast<extensions::TestExtensionSystem*>(
+            extensions::ExtensionSystem::Get(&profile_)));
     extension_service_ = extension_system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), FilePath(), false);
 
diff --git a/chrome/browser/ui/views/ash/panel_view_aura.cc b/chrome/browser/ui/views/ash/panel_view_aura.cc
index 17df784..451f4b2 100644
--- a/chrome/browser/ui/views/ash/panel_view_aura.cc
+++ b/chrome/browser/ui/views/ash/panel_view_aura.cc
@@ -246,8 +246,9 @@ void PanelExtensionWindowController::SetFullscreenMode(
 
 bool PanelExtensionWindowController::IsVisibleToExtension(
     const extensions::Extension* extension) const {
- ExtensionProcessManager* process_manager =
-      ExtensionSystem::Get(panel_host_->profile())->process_manager();
+  ExtensionProcessManager* process_manager =
+      extensions::ExtensionSystem::Get(
+          panel_host_->profile())->process_manager();
   const extensions::Extension* panel_extension = process_manager->
       GetExtensionForRenderViewHost(
           panel_view_->WebContents()->GetRenderViewHost());
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 4890b9e..8b2b364 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -276,7 +276,7 @@ void LocationBarView::Init(views::View* popup_parent_view) {
 
   if (extensions::switch_utils::IsActionBoxEnabled()) {
     action_box_button_view_ = new ActionBoxButtonView(
-        ExtensionSystem::Get(profile_)->extension_service());
+        extensions::ExtensionSystem::Get(profile_)->extension_service());
     AddChildView(action_box_button_view_);
   } else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
     // Note: condition above means that the star and ChromeToMobile icons are
diff --git a/chrome/browser/ui/webui/extensions/command_handler.cc b/chrome/browser/ui/webui/extensions/command_handler.cc
index 5ccb19f..135caee 100644
--- a/chrome/browser/ui/webui/extensions/command_handler.cc
+++ b/chrome/browser/ui/webui/extensions/command_handler.cc
@@ -99,8 +99,8 @@ void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
   CommandService* command_service =
       CommandServiceFactory::GetForProfile(profile);
 
-  const ExtensionSet* extensions =
-      ExtensionSystem::Get(profile)->extension_service()->extensions();
+  const ExtensionSet* extensions = extensions::ExtensionSystem::Get(profile)->
+      extension_service()->extensions();
   for (ExtensionSet::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     scoped_ptr<DictionaryValue> extension_dict(new DictionaryValue);
diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.cc b/chrome/browser/ui/webui/extensions/extension_info_ui.cc
index 5afafc1..36090cc 100644
--- a/chrome/browser/ui/webui/extensions/extension_info_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extension_info_ui.cc
@@ -52,8 +52,8 @@ GURL ExtensionInfoUI::GetURL(const std::string& extension_id) {
 
 void ExtensionInfoUI::AddExtensionDataToSource(
     const std::string& extension_id) {
-  ExtensionService* extension_service =
-      ExtensionSystem::Get(Profile::FromWebUI(web_ui()))->extension_service();
+  ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+      Profile::FromWebUI(web_ui()))->extension_service();
   const extensions::Extension* extension =
       extension_service->extensions()->GetByID(extension_id);
   if (!extension)
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 8092925..fd2dace 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -313,7 +313,7 @@ void ExtensionSettingsHandler::RegisterMessages() {
         GetExtensionService();
   }
   if (!management_policy_) {
-    management_policy_ = ExtensionSystem::Get(
+    management_policy_ = extensions::ExtensionSystem::Get(
         extension_service_->profile())->management_policy();
   }
 
@@ -567,7 +567,7 @@ void ExtensionSettingsHandler::HandleInspectMessage(const ListValue* args) {
 
     ExtensionProcessManager* pm = profile->GetExtensionProcessManager();
     extensions::LazyBackgroundTaskQueue* queue =
-        ExtensionSystem::Get(profile)->lazy_background_task_queue();
+        extensions::ExtensionSystem::Get(profile)->lazy_background_task_queue();
 
     ExtensionHost* host = pm->GetBackgroundHostForExtension(extension->id());
     if (host) {
diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.cc b/chrome/browser/ui/webui/extensions/install_extension_handler.cc
index 77a25ef..03e77b8 100644
--- a/chrome/browser/ui/webui/extensions/install_extension_handler.cc
+++ b/chrome/browser/ui/webui/extensions/install_extension_handler.cc
@@ -85,7 +85,7 @@ void InstallExtensionHandler::HandleInstallMessage(const ListValue* args) {
   Profile* profile = browser->profile();
   scoped_refptr<CrxInstaller> crx_installer(
       CrxInstaller::Create(
-          ExtensionSystem::Get(profile)->extension_service(),
+          extensions::ExtensionSystem::Get(profile)->extension_service(),
           chrome::CreateExtensionInstallPromptWithBrowser(browser)));
   crx_installer->set_off_store_install_allow_reason(
       CrxInstaller::OffStoreInstallAllowedFromSettingsPage);
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 256f392..f45e39e 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -117,7 +117,7 @@ void AppLauncherHandler::CreateAppInfo(const Extension* extension,
       !service->GetTerminatedExtension(extension->id());
   extension->GetBasicInfo(enabled, value);
 
-  value->SetBoolean("mayDisable", ExtensionSystem::Get(
+  value->SetBoolean("mayDisable", extensions::ExtensionSystem::Get(
       service->profile())->management_policy()->UserMayModifySettings(
       extension, NULL));
 
@@ -598,8 +598,8 @@ void AppLauncherHandler::HandleUninstallApp(const ListValue* args) {
   if (!extension)
     return;
 
-  if (!ExtensionSystem::Get(extension_service_->profile())->
-        management_policy()->UserMayModifySettings(extension, NULL)) {
+  if (!extensions::ExtensionSystem::Get(extension_service_->profile())->
+          management_policy()->UserMayModifySettings(extension, NULL)) {
     LOG(ERROR) << "Attempt to uninstall an extension that is non-usermanagable "
                << "was made. Extension id : " << extension->id();
     return;
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 81fa39c..aa471a8 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -214,8 +214,8 @@ void TestingProfile::Init() {
   if (!file_util::PathExists(profile_path_))
     file_util::CreateDirectory(profile_path_);
 
-  ExtensionSystemFactory::GetInstance()->SetTestingFactory(
-      this, TestExtensionSystem::Build);
+  extensions::ExtensionSystemFactory::GetInstance()->SetTestingFactory(
+      this, extensions::TestExtensionSystem::Build);
 
   profile_dependency_manager_->CreateProfileServices(this, true);
 
@@ -448,19 +448,19 @@ VisitedLinkMaster* TestingProfile::GetVisitedLinkMaster() {
 }
 
 ExtensionService* TestingProfile::GetExtensionService() {
-  return ExtensionSystem::Get(this)->extension_service();
+  return extensions::ExtensionSystem::Get(this)->extension_service();
 }
 
 UserScriptMaster* TestingProfile::GetUserScriptMaster() {
-  return ExtensionSystem::Get(this)->user_script_master();
+  return extensions::ExtensionSystem::Get(this)->user_script_master();
 }
 
 ExtensionProcessManager* TestingProfile::GetExtensionProcessManager() {
-  return ExtensionSystem::Get(this)->process_manager();
+  return extensions::ExtensionSystem::Get(this)->process_manager();
 }
 
 ExtensionEventRouter* TestingProfile::GetExtensionEventRouter() {
-  return ExtensionSystem::Get(this)->event_router();
+  return extensions::ExtensionSystem::Get(this)->event_router();
 }
 
 void TestingProfile::SetExtensionSpecialStoragePolicy(
@@ -552,7 +552,7 @@ net::URLRequestContextGetter* TestingProfile::GetRequestContext() {
 net::URLRequestContextGetter* TestingProfile::GetRequestContextForRenderProcess(
     int renderer_child_id) {
   ExtensionService* extension_service =
-      ExtensionSystem::Get(this)->extension_service();
+      extensions::ExtensionSystem::Get(this)->extension_service();
   if (extension_service) {
     const extensions::Extension* installed_app = extension_service->
         GetInstalledAppForRenderer(renderer_child_id);