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

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index ee19e7fc8039a635ecc3d0296bef1630041db5c0..2ed4b6649174f9ed453528a835318e0929ce4c5c 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -36,6 +36,8 @@
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
 #include "chrome/browser/extensions/external_extension_provider_interface.h"
 #include "chrome/browser/extensions/external_pref_extension_loader.h"
@@ -43,6 +45,7 @@
 #include "chrome/browser/extensions/pack_extension_job.cc"
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
+#include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/plugin_prefs_factory.h"
@@ -50,6 +53,7 @@
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/themes/theme_service_factory.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -372,20 +376,6 @@ class MockProviderVisitor
   DISALLOW_COPY_AND_ASSIGN(MockProviderVisitor);
 };
 
-class ExtensionTestingProfile : public TestingProfile {
- public:
-  ExtensionTestingProfile() : service_(NULL) {
-  }
-
-  void set_extensions_service(ExtensionService* service) {
-    service_ = service;
-  }
-  virtual ExtensionService* GetExtensionService() { return service_; }
-
- private:
-  ExtensionService* service_;
-};
-
 // Our message loop may be used in tests which require it to be an IO loop.
 ExtensionServiceTestBase::ExtensionServiceTestBase()
     : loop_(MessageLoop::TYPE_IO),
@@ -418,7 +408,7 @@ ExtensionServiceTestBase::~ExtensionServiceTestBase() {
 void ExtensionServiceTestBase::InitializeExtensionService(
     const FilePath& pref_file, const FilePath& extensions_install_dir,
     bool autoupdate_enabled) {
-  ExtensionTestingProfile* profile = new ExtensionTestingProfile();
+  TestingProfile* profile = new TestingProfile();
   // Create a PrefService that only contains user defined preference values.
   PrefService* prefs =
       PrefServiceMockBuilder().WithUserFilePrefs(pref_file).Create();
@@ -431,13 +421,13 @@ void ExtensionServiceTestBase::InitializeExtensionService(
 
   profile_.reset(profile);
 
-  service_ = profile->CreateExtensionService(
-      CommandLine::ForCurrentProcess(),
-      extensions_install_dir,
-      autoupdate_enabled);
+  service_ = static_cast<TestExtensionSystem*>(
+      ExtensionSystemFactory::GetForProfile(profile))->CreateExtensionService(
+          CommandLine::ForCurrentProcess(),
+          extensions_install_dir,
+          autoupdate_enabled);
   service_->set_extensions_enabled(true);
   service_->set_show_extensions_prompts(false);
-  profile->set_extensions_service(service_);
 
   // When we start up, we want to make sure there is no external provider,
   // since the ExtensionService on Windows will use the Registry as a default
@@ -471,7 +461,9 @@ void ExtensionServiceTestBase::InitializeEmptyExtensionService() {
 }
 
 void ExtensionServiceTestBase::InitializeExtensionProcessManager() {
-  profile_->CreateExtensionProcessManager();
+  static_cast<TestExtensionSystem*>(
+      ExtensionSystemFactory::GetForProfile(profile_.get()))->
+      CreateExtensionProcessManager();
 }
 
 void ExtensionServiceTestBase::InitializeExtensionServiceWithUpdater() {
@@ -498,8 +490,8 @@ void ExtensionServiceTestBase::InitializeExtensionServiceHelper(
 
 void ExtensionServiceTestBase::InitializeRequestContext() {
   ASSERT_TRUE(profile_.get());
-  ExtensionTestingProfile* profile =
-      static_cast<ExtensionTestingProfile*>(profile_.get());
+  TestingProfile* profile =
+      static_cast<TestingProfile*>(profile_.get());
   profile->CreateRequestContext();
 }
 
@@ -746,7 +738,7 @@ class ExtensionServiceTest
                 enabled_extension_count);
     }
 
-    // Update() should delete the temporary input file.
+    // Update() should the temporary input file.
     EXPECT_FALSE(file_util::PathExists(path));
   }
 
@@ -3862,11 +3854,12 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
 
   // By default, we are enabled.
   command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
-  // Owned by |profile|.
-  ExtensionService* service =
-      profile->CreateExtensionService(command_line.get(),
-                                      install_dir,
-                                      false);
+  ExtensionService* service = static_cast<TestExtensionSystem*>(
+      ExtensionSystemFactory::GetForProfile(profile.get()))->
+      CreateExtensionService(
+          command_line.get(),
+          install_dir,
+          false);
   EXPECT_TRUE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
@@ -3876,9 +3869,12 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
   recorder.set_ready(false);
   profile.reset(new TestingProfile());
   command_line->AppendSwitch(switches::kDisableExtensions);
-  service = profile->CreateExtensionService(command_line.get(),
-                                            install_dir,
-                                            false);
+  service = static_cast<TestExtensionSystem*>(
+      ExtensionSystemFactory::GetForProfile(profile.get()))->
+      CreateExtensionService(
+          command_line.get(),
+          install_dir,
+          false);
   EXPECT_FALSE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
@@ -3887,9 +3883,12 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
   recorder.set_ready(false);
   profile.reset(new TestingProfile());
   profile->GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
-  service = profile->CreateExtensionService(command_line.get(),
-                                            install_dir,
-                                            false);
+  service = static_cast<TestExtensionSystem*>(
+      ExtensionSystemFactory::GetForProfile(profile.get()))->
+      CreateExtensionService(
+          command_line.get(),
+          install_dir,
+          false);
   EXPECT_FALSE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
@@ -3899,9 +3898,12 @@ TEST(ExtensionServiceTestSimple, Enabledness) {
   profile.reset(new TestingProfile());
   profile->GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
   command_line.reset(new CommandLine(CommandLine::NO_PROGRAM));
-  service = profile->CreateExtensionService(command_line.get(),
-                                            install_dir,
-                                            false);
+  service = static_cast<TestExtensionSystem*>(
+      ExtensionSystemFactory::GetForProfile(profile.get()))->
+      CreateExtensionService(
+          command_line.get(),
+          install_dir,
+          false);
   EXPECT_FALSE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();