Revert 24846 - Enable extensions by default....

chrome/browser/extensions/extensions_service_unittest.cc

 // Copyright (c) 2006-2009 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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 1516 matching lines @@
 // enabled or not.
 TEST(ExtensionsServiceTestSimple, Enabledness) {
   ExtensionsReadyRecorder recorder;
   TestingProfile profile;
   MessageLoop loop;
   scoped_ptr<CommandLine> command_line;
   scoped_refptr<ExtensionsService> service;
   FilePath install_dir = profile.GetPath()
       .AppendASCII(ExtensionsService::kInstallDirectoryName);
 
-  // By default, we are enabled.
+  // By default, we are disabled.
   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());
+  service->Init();
+  loop.RunAllPending();
+  EXPECT_TRUE(recorder.ready());
+
+  // If either the command line or pref is set, we are enabled.
+  recorder.set_ready(false);
+  command_line->AppendSwitch(switches::kEnableExtensions);
+  service = new ExtensionsService(&profile, command_line.get(),
+      profile.GetPrefs(), install_dir, &loop, &loop, false);
   EXPECT_TRUE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
   EXPECT_TRUE(recorder.ready());
 
-  // If either the command line or pref is set, we are disabled.
   recorder.set_ready(false);
-  command_line->AppendSwitch(switches::kDisableExtensions);
+  profile.GetPrefs()->SetBoolean(prefs::kEnableExtensions, true);
   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());
-
-  recorder.set_ready(false);
-  profile.GetPrefs()->SetBoolean(prefs::kDisableExtensions, true);
-  service = new ExtensionsService(&profile, command_line.get(),
-      profile.GetPrefs(), install_dir, &loop, &loop, false);
-  EXPECT_FALSE(service->extensions_enabled());
-  service->Init();
-  loop.RunAllPending();
-  EXPECT_TRUE(recorder.ready());
 
   recorder.set_ready(false);
   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());
 }