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

chrome/browser/extensions/extension_updater_unittest.cc

Index: chrome/browser/extensions/extension_updater_unittest.cc
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 72eabc47e12c5a7643050e571fd92738afc721ce..d94e40957120560a4aa7970431bbc0313fcfd0af 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -18,9 +18,12 @@
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_error_reporter.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/extension_updater.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/browser/extensions/test_extension_service.h"
+#include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/extensions/extension.h"
@@ -812,17 +815,21 @@ class ExtensionUpdaterTest : public testing::Test {
     // service, not on our mock |service|.  This allows us to fake
     // the CrxInstaller actions we want.
     TestingProfile profile;
-    profile.CreateExtensionService(
-        CommandLine::ForCurrentProcess(),
-        FilePath(),
-        false);
-    profile.GetExtensionService()->set_extensions_enabled(true);
-    profile.GetExtensionService()->set_show_extensions_prompts(false);
+    static_cast<TestExtensionSystem*>(
+        ExtensionSystemFactory::GetForProfile(&profile))->
+        CreateExtensionService(
+            CommandLine::ForCurrentProcess(),
+            FilePath(),
+            false);
+    ExtensionService* extension_service =
+        ExtensionSystemFactory::GetForProfile(&profile)->extension_service();
+    extension_service->set_extensions_enabled(true);
+    extension_service->set_show_extensions_prompts(false);
 
     scoped_refptr<CrxInstaller> fake_crx1(
-        CrxInstaller::Create(profile.GetExtensionService(), NULL));
+        CrxInstaller::Create(extension_service, NULL));
     scoped_refptr<CrxInstaller> fake_crx2(
-        CrxInstaller::Create(profile.GetExtensionService(), NULL));
+        CrxInstaller::Create(extension_service, NULL));
 
     if (updates_start_running) {
       // Add fake CrxInstaller to be returned by service.UpdateExtension().