Reland 125805 - Reland 124817 - A profile-keyed service for Extensions, ExtensionSystem.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 0c894336d6b33b01f7fc0a6ce77261a70fbb01b9..cf3ff5a367049b6bd8382ff0d63cc40290e53955 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -28,19 +28,14 @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/extensions/component_loader.h"
-#include "chrome/browser/extensions/extension_devtools_manager.h"
-#include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_event_router.h"
-#include "chrome/browser/extensions/extension_info_map.h"
-#include "chrome/browser/extensions/extension_message_service.h"
-#include "chrome/browser/extensions/extension_navigation_observer.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
+#include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
-#include "chrome/browser/extensions/lazy_background_task_queue.h"
-#include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
@@ -228,7 +223,6 @@ ProfileImpl::ProfileImpl(const FilePath& path,
       ALLOW_THIS_IN_INITIALIZER_LIST(visited_link_event_listener_(
           new VisitedLinkEventListener(this))),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
-      extension_devtools_manager_(NULL),
       host_content_settings_map_(NULL),
       history_service_created_(false),
       favicon_service_created_(false),
@@ -432,105 +426,6 @@ void ProfileImpl::InitHostZoomMap() {
                content::Source<HostZoomMap>(host_zoom_map));
 }
 
-void ProfileImpl::InitExtensions(bool extensions_enabled) {
-  if (user_script_master_ || extension_service_.get())
-    return;  // Already initialized.
-
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(
-      switches::kEnableExtensionTimelineApi)) {
-    extension_devtools_manager_ = new ExtensionDevToolsManager(this);
-  }
-
-  // The ExtensionInfoMap needs to be created before the
-  // ExtensionProcessManager.
-  extension_info_map_ = new ExtensionInfoMap();
-  extension_process_manager_.reset(ExtensionProcessManager::Create(this));
-  lazy_background_task_queue_.reset(new LazyBackgroundTaskQueue(this));
-  extension_event_router_.reset(new ExtensionEventRouter(this));
-  extension_message_service_.reset(new ExtensionMessageService(
-      lazy_background_task_queue_.get()));
-  extension_navigation_observer_.reset(new ExtensionNavigationObserver(this));
-
-  ExtensionErrorReporter::Init(true);  // allow noisy errors.
-
-  user_script_master_ = new UserScriptMaster(this);
-
-  bool autoupdate_enabled = true;
-#if defined(OS_CHROMEOS)
-  if (!extensions_enabled)
-    autoupdate_enabled = false;
-  else
-    autoupdate_enabled = !command_line->HasSwitch(switches::kGuestSession);
-#endif
-  extension_service_.reset(new ExtensionService(
-      this,
-      CommandLine::ForCurrentProcess(),
-      GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
-      extension_prefs_.get(),
-      autoupdate_enabled,
-      extensions_enabled));
-
-  extension_service_->component_loader()->AddDefaultComponentExtensions();
-  if (command_line->HasSwitch(switches::kLoadComponentExtension)) {
-    CommandLine::StringType path_list = command_line->GetSwitchValueNative(
-        switches::kLoadComponentExtension);
-    StringTokenizerT<CommandLine::StringType,
-        CommandLine::StringType::const_iterator> t(path_list,
-                                                   FILE_PATH_LITERAL(","));
-    while (t.GetNext()) {
-      // Load the component extension manifest synchronously.
-      // Blocking the UI thread is acceptable here since
-      // this flag designated for developers.
-      base::ThreadRestrictions::ScopedAllowIO allow_io;
-      extension_service_->component_loader()->AddOrReplace(
-          FilePath(t.token()));
-    }
-  }
-  extension_service_->Init();
-
-  if (extensions_enabled) {
-    // Load any extensions specified with --load-extension.
-    // TODO(yoz): Seems like this should move into ExtensionService::Init.
-    if (command_line->HasSwitch(switches::kLoadExtension)) {
-      CommandLine::StringType path_list = command_line->GetSwitchValueNative(
-          switches::kLoadExtension);
-      StringTokenizerT<CommandLine::StringType,
-          CommandLine::StringType::const_iterator> t(path_list,
-                                                     FILE_PATH_LITERAL(","));
-      scoped_refptr<extensions::UnpackedInstaller> installer =
-          extensions::UnpackedInstaller::Create(extension_service_.get());
-      while (t.GetNext()) {
-        installer->LoadFromCommandLine(FilePath(t.token()));
-      }
-    }
-  }
-
-  // Make the chrome://extension-icon/ resource available.
-  GetChromeURLDataManager()->AddDataSource(new ExtensionIconSource(this));
-
-  // Initialize extension event routers. Note that on Chrome OS, this will
-  // not succeed if the user has not logged in yet, in which case the
-  // event routers are initialized in LoginUtilsImpl::CompleteLogin instead.
-  // The InitEventRouters call used to be in BrowserMain, because when bookmark
-  // import happened on first run, the bookmark bar was not being correctly
-  // initialized (see issue 40144). Now that bookmarks aren't imported and
-  // the event routers need to be initialized for every profile individually,
-  // initialize them with the extension service.
-  // If this profile is being created as part of the import process, never
-  // initialize the event routers. If import is going to run in a separate
-  // process (the profile itself is on the main process), wait for import to
-  // finish before initializing the routers.
-  if (!command_line->HasSwitch(switches::kImport) &&
-      !command_line->HasSwitch(switches::kImportFromFile)) {
-    if (g_browser_process->profile_manager()->will_import()) {
-      extension_service_->InitEventRoutersAfterImport();
-    } else {
-      extension_service_->InitEventRouters();
-    }
-  }
-}
-
 void ProfileImpl::InitPromoResources() {
   if (promo_resource_service_)
     return;
@@ -691,27 +586,19 @@ VisitedLinkMaster* ProfileImpl::GetVisitedLinkMaster() {
 }
 
 ExtensionService* ProfileImpl::GetExtensionService() {
-  return extension_service_.get();
+  return ExtensionSystemFactory::GetForProfile(this)->extension_service();
 }
 
 UserScriptMaster* ProfileImpl::GetUserScriptMaster() {
-  return user_script_master_.get();
-}
-
-ExtensionDevToolsManager* ProfileImpl::GetExtensionDevToolsManager() {
-  return extension_devtools_manager_.get();
+  return ExtensionSystemFactory::GetForProfile(this)->user_script_master();
 }
 
 ExtensionProcessManager* ProfileImpl::GetExtensionProcessManager() {
-  return extension_process_manager_.get();
-}
-
-ExtensionMessageService* ProfileImpl::GetExtensionMessageService() {
-  return extension_message_service_.get();
+  return ExtensionSystemFactory::GetForProfile(this)->process_manager();
 }
 
 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() {
-  return extension_event_router_.get();
+  return ExtensionSystemFactory::GetForProfile(this)->event_router();
 }
 
 ExtensionSpecialStoragePolicy*
@@ -723,10 +610,6 @@ ExtensionSpecialStoragePolicy*
   return extension_special_storage_policy_.get();
 }
 
-LazyBackgroundTaskQueue* ProfileImpl::GetLazyBackgroundTaskQueue() {
-  return lazy_background_task_queue_.get();
-}
-
 void ProfileImpl::OnPrefsLoaded(bool success) {
   if (!success) {
     if (delegate_)
@@ -751,20 +634,8 @@ void ProfileImpl::OnPrefsLoaded(bool success) {
   // Mark the session as open.
   prefs_->SetBoolean(prefs::kSessionExitedCleanly, false);
 
-  bool extensions_disabled =
-      prefs_->GetBoolean(prefs::kDisableExtensions) ||
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableExtensions);
-
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
-  // Ensure that preferences set by extensions are restored in the profile
-  // as early as possible. The constructor takes care of that.
-  extension_prefs_.reset(new ExtensionPrefs(
-      prefs_.get(),
-      GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
-      GetExtensionPrefValueMap()));
-  extension_prefs_->Init(extensions_disabled);
-
   DCHECK(!net_pref_observer_.get());
   net_pref_observer_.reset(new NetPrefObserver(
       prefs_.get(),
@@ -818,8 +689,10 @@ net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess(
     int renderer_child_id) {
-  if (extension_service_.get()) {
-    const Extension* installed_app = extension_service_->
+  ExtensionService* extension_service =
+      ExtensionSystemFactory::GetForProfile(this)->extension_service();
+  if (extension_service) {
+    const Extension* installed_app = extension_service->
         GetInstalledAppForRenderer(renderer_child_id);
     if (installed_app != NULL && installed_app->is_storage_isolated() &&
         installed_app->HasAPIPermission(
@@ -855,31 +728,6 @@ net::URLRequestContextGetter* ProfileImpl::GetRequestContextForIsolatedApp(
   return io_data_.GetIsolatedAppRequestContextGetter(app_id);
 }
 
-void ProfileImpl::RegisterExtensionWithRequestContexts(
-    const Extension* extension) {
-  base::Time install_time;
-  if (extension->location() != Extension::COMPONENT) {
-    install_time = GetExtensionService()->extension_prefs()->
-        GetInstallTime(extension->id());
-  }
-  bool incognito_enabled =
-      GetExtensionService()->IsIncognitoEnabled(extension->id());
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&ExtensionInfoMap::AddExtension, extension_info_map_.get(),
-                 make_scoped_refptr(extension), install_time,
-                 incognito_enabled));
-}
-
-void ProfileImpl::UnregisterExtensionWithRequestContexts(
-    const std::string& extension_id,
-    const extension_misc::UnloadedExtensionReason reason) {
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&ExtensionInfoMap::RemoveExtension, extension_info_map_.get(),
-                 extension_id, reason));
-}
-
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
@@ -1134,10 +982,6 @@ void ProfileImpl::EnsureSessionServiceCreated() {
   SessionServiceFactory::GetForProfile(this);
 }
 
-ExtensionInfoMap* ProfileImpl::GetExtensionInfoMap() {
-  return extension_info_map_.get();
-}
-
 ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() {
   if (!chrome_url_data_manager_.get())
     chrome_url_data_manager_.reset(new ChromeURLDataManager(