Revert 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem.

chrome/test/base/testing_profile.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
-#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_system_factory.h"
-#include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
@@ skipping 155 matching lines @@
   if (delegate_) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(&TestingProfile::FinishInit,
                                                 base::Unretained(this)));
   } else {
     FinishInit();
   }
 }
 
 void TestingProfile::Init() {
-  ExtensionSystemFactory::GetInstance()->SetTestingFactory(
-      this, TestExtensionSystem::Build);
-
   profile_dependency_manager_->CreateProfileServices(this, true);
 
 #if defined(ENABLE_NOTIFICATIONS)
   // Install profile keyed service factory hooks for dummy/test services
   DesktopNotificationServiceFactory::GetInstance()->SetTestingFactory(
       this, CreateTestDesktopNotificationService);
 #endif
 }
 
 void TestingProfile::FinishInit() {
@@ skipping 171 matching lines @@
   if (turl_model->loaded())
     return;
 
   ui_test_utils::WindowedNotificationObserver turl_service_load_observer(
       chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
       content::NotificationService::AllSources());
   turl_model->Load();
   turl_service_load_observer.Wait();
 }
 
+void TestingProfile::CreateExtensionProcessManager() {
+  extension_process_manager_.reset(ExtensionProcessManager::Create(this));
+}
+
+ExtensionService* TestingProfile::CreateExtensionService(
+    const CommandLine* command_line,
+    const FilePath& install_directory,
+    bool autoupdate_enabled) {
+  // Extension pref store, created for use by |extension_prefs_|.
+
+  extension_pref_value_map_.reset(new ExtensionPrefValueMap);
+
+  bool extensions_disabled =
+      command_line && command_line->HasSwitch(switches::kDisableExtensions);
+
+  // Note that the GetPrefs() creates a TestingPrefService, therefore
+  // the extension controlled pref values set in extension_prefs_
+  // are not reflected in the pref service. One would need to
+  // inject a new ExtensionPrefStore(extension_pref_value_map_.get(), false).
+  extension_prefs_.reset(
+      new ExtensionPrefs(GetPrefs(),
+                         install_directory,
+                         extension_pref_value_map_.get()));
+  extension_prefs_->Init(extensions_disabled);
+  extension_service_.reset(new ExtensionService(this,
+                                                command_line,
+                                                install_directory,
+                                                extension_prefs_.get(),
+                                                autoupdate_enabled,
+                                                true));
+  return extension_service_.get();
+}
+
 FilePath TestingProfile::GetPath() {
   return profile_path_;
 }
 
 TestingPrefService* TestingProfile::GetTestingPrefService() {
   if (!prefs_.get())
     CreateTestingPrefService();
   DCHECK(testing_prefs_);
   return testing_prefs_;
 }
@@ skipping 27 matching lines @@
 }
 
 Profile* TestingProfile::GetOriginalProfile() {
   return this;
 }
 
 VisitedLinkMaster* TestingProfile::GetVisitedLinkMaster() {
   return NULL;
 }
 
-ExtensionPrefValueMap* TestingProfile::GetExtensionPrefValueMap() {
-  return NULL;
-}
-
 ExtensionService* TestingProfile::GetExtensionService() {
-  return ExtensionSystemFactory::GetForProfile(this)->extension_service();
+  return extension_service_.get();
 }
 
 UserScriptMaster* TestingProfile::GetUserScriptMaster() {
-  return ExtensionSystemFactory::GetForProfile(this)->user_script_master();
+  return NULL;
+}
+
+ExtensionDevToolsManager* TestingProfile::GetExtensionDevToolsManager() {
+  return NULL;
 }
 
 ExtensionProcessManager* TestingProfile::GetExtensionProcessManager() {
-  return ExtensionSystemFactory::GetForProfile(this)->process_manager();
+  return extension_process_manager_.get();
+}
+
+ExtensionMessageService* TestingProfile::GetExtensionMessageService() {
+  return NULL;
 }
 
 ExtensionEventRouter* TestingProfile::GetExtensionEventRouter() {
-  return ExtensionSystemFactory::GetForProfile(this)->event_router();
+  return NULL;
 }
 
 void TestingProfile::SetExtensionSpecialStoragePolicy(
     ExtensionSpecialStoragePolicy* extension_special_storage_policy) {
   extension_special_storage_policy_ = extension_special_storage_policy;
 }
 
 ExtensionSpecialStoragePolicy*
 TestingProfile::GetExtensionSpecialStoragePolicy() {
   if (!extension_special_storage_policy_.get())
@@ skipping 74 matching lines @@
 DownloadManager* TestingProfile::GetDownloadManager() {
   return NULL;
 }
 
 net::URLRequestContextGetter* TestingProfile::GetRequestContext() {
   return request_context_.get();
 }
 
 net::URLRequestContextGetter* TestingProfile::GetRequestContextForRenderProcess(
     int renderer_child_id) {
-  ExtensionService* extension_service =
-      ExtensionSystemFactory::GetForProfile(this)->extension_service();
-  if (extension_service) {
-    const Extension* installed_app = extension_service->
+  if (extension_service_.get()) {
+    const Extension* installed_app = extension_service_->
         GetInstalledAppForRenderer(renderer_child_id);
     if (installed_app != NULL && installed_app->is_storage_isolated())
       return GetRequestContextForIsolatedApp(installed_app->id());
   }
 
   return GetRequestContext();
 }
 
 void TestingProfile::CreateRequestContext() {
   if (!request_context_)
@@ skipping 121 matching lines @@
   MessageLoop::current()->Run();
 }
 
 TokenService* TestingProfile::GetTokenService() {
   if (!token_service_.get()) {
     token_service_.reset(new TokenService());
   }
   return token_service_.get();
 }
 
+ExtensionInfoMap* TestingProfile::GetExtensionInfoMap() {
+  return NULL;
+}
+
 PromoCounter* TestingProfile::GetInstantPromoCounter() {
   return NULL;
 }
 
 ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() {
   if (!chrome_url_data_manager_.get())
     chrome_url_data_manager_.reset(
         new ChromeURLDataManager(
             base::Callback<ChromeURLDataManagerBackend*(void)>()));
   return chrome_url_data_manager_.get();
@@ skipping 18 matching lines @@
 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
   return GetExtensionSpecialStoragePolicy();
 }
 
 void TestingProfile::DestroyWebDataService() {
   if (!web_data_service_.get())
     return;
 
   web_data_service_->Shutdown();
 }