Revert 25204 - Revert 24846 Enable extensions by default....

chrome/browser/extensions/extensions_service_unittest.cc

Index: chrome/browser/extensions/extensions_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extensions_service_unittest.cc	(revision 25205)
+++ chrome/browser/extensions/extensions_service_unittest.cc	(working copy)
@@ -1534,30 +1534,30 @@
   FilePath install_dir = profile.GetPath()
       .AppendASCII(ExtensionsService::kInstallDirectoryName);
 
-  // By default, we are disabled.
+  // By default, we are enabled.
   command_line.reset(new CommandLine(L""));
   service = new ExtensionsService(&profile, command_line.get(),
       profile.GetPrefs(), install_dir, &loop, &loop, false);
-  EXPECT_FALSE(service->extensions_enabled());
+  EXPECT_TRUE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
   EXPECT_TRUE(recorder.ready());
 
-  // If either the command line or pref is set, we are enabled.
+  // If either the command line or pref is set, we are disabled.
   recorder.set_ready(false);
-  command_line->AppendSwitch(switches::kEnableExtensions);
+  command_line->AppendSwitch(switches::kDisableExtensions);
   service = new ExtensionsService(&profile, command_line.get(),
       profile.GetPrefs(), install_dir, &loop, &loop, false);
-  EXPECT_TRUE(service->extensions_enabled());
+  EXPECT_FALSE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
   EXPECT_TRUE(recorder.ready());
 
   recorder.set_ready(false);
-  profile.GetPrefs()->SetBoolean(prefs::kEnableExtensions, true);
+  profile.GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
   service = new ExtensionsService(&profile, command_line.get(),
       profile.GetPrefs(), install_dir, &loop, &loop, false);
-  EXPECT_TRUE(service->extensions_enabled());
+  EXPECT_FALSE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
   EXPECT_TRUE(recorder.ready());
@@ -1566,7 +1566,7 @@
   command_line.reset(new CommandLine(L""));
   service = new ExtensionsService(&profile, command_line.get(),
       profile.GetPrefs(), install_dir, &loop, &loop, false);
-  EXPECT_TRUE(service->extensions_enabled());
+  EXPECT_FALSE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
   EXPECT_TRUE(recorder.ready());