Enable extensions by default.

BUG=20573
TEST=Install sample extensions without modifying command line flags. They should install (and run on next startup).

Review URL: http://codereview.chromium.org/179032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24846 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 15 insertions, 19 deletions

diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index cf7a513..9c14779 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -39,8 +39,6 @@ void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
   // This enables it for extension hosts.
   ExtensionHost::EnableDOMAutomation();
 
-  command_line->AppendSwitch(switches::kEnableExtensions);
-
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
   test_data_dir_ = test_data_dir_.AppendASCII("extensions");
 }
diff --git a/chrome/browser/extensions/extension_startup_unittest.cc b/chrome/browser/extensions/extension_startup_unittest.cc
index 889ac8e..0efb161 100644
--- a/chrome/browser/extensions/extension_startup_unittest.cc
+++ b/chrome/browser/extensions/extension_startup_unittest.cc
@@ -45,8 +45,6 @@ class ExtensionStartupTestBase
     extensions_dir_ = profile_dir.AppendASCII("Extensions");
 
     if (enable_extensions_) {
-      command_line->AppendSwitch(switches::kEnableExtensions);
-
       FilePath src_dir;
       PathService::Get(chrome::DIR_TEST_DATA, &src_dir);
       src_dir = src_dir.AppendASCII("extensions").AppendASCII("good");
@@ -55,6 +53,8 @@ class ExtensionStartupTestBase
                           preferences_file_);
       file_util::CopyDirectory(src_dir.AppendASCII("Extensions"),
                                profile_dir, true);  // recursive
+    } else {
+      command_line->AppendSwitch(switches::kDisableExtensions);
     }
 
     if (enable_user_scripts_) {
diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc
index 0d48dcd..28c06f6 100644
--- a/chrome/browser/extensions/extension_uitest.cc
+++ b/chrome/browser/extensions/extension_uitest.cc
@@ -37,8 +37,6 @@ template <class ParentTestType>
 class ExtensionUITest : public ParentTestType {
  public:
   explicit ExtensionUITest(const std::string& extension_path) {
-    launch_arguments_.AppendSwitch(switches::kEnableExtensions);
-
     FilePath filename(test_data_directory_);
     filename = filename.AppendASCII(extension_path);
     launch_arguments_.AppendSwitchWithValue(switches::kLoadExtension,
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index b53f243..7b1c230 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -95,14 +95,14 @@ ExtensionsService::ExtensionsService(Profile* profile,
       extension_prefs_(new ExtensionPrefs(prefs, install_directory)),
       backend_loop_(backend_loop),
       install_directory_(install_directory),
-      extensions_enabled_(false),
+      extensions_enabled_(true),
       show_extensions_prompts_(true),
       ready_(false) {
   // Figure out if extension installation should be enabled.
-  if (command_line->HasSwitch(switches::kEnableExtensions)) {
-    extensions_enabled_ = true;
-  } else if (profile->GetPrefs()->GetBoolean(prefs::kEnableExtensions)) {
-    extensions_enabled_ = true;
+  if (command_line->HasSwitch(switches::kDisableExtensions)) {
+    extensions_enabled_ = false;
+  } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) {
+    extensions_enabled_ = false;
   }
 
   // Set up the ExtensionUpdater
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 6df27a9..bcb5ece3 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -1534,30 +1534,30 @@ TEST(ExtensionsServiceTestSimple, Enabledness) {
   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 @@ TEST(ExtensionsServiceTestSimple, Enabledness) {
   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());