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

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 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 "chrome/browser/extensions/extensions_service.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 77 matching lines @@
                                      const CommandLine* command_line,
                                      PrefService* prefs,
                                      const FilePath& install_directory,
                                      MessageLoop* frontend_loop,
                                      MessageLoop* backend_loop,
                                      bool autoupdate_enabled)
     : 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
   if (autoupdate_enabled) {
     int update_frequency = kDefaultUpdateFrequencySeconds;
     if (command_line->HasSwitch(switches::kExtensionsUpdateFrequency)) {
       update_frequency = StringToInt(WideToASCII(command_line->GetSwitchValue(
           switches::kExtensionsUpdateFrequency)));
     }
     updater_ = new ExtensionUpdater(this, prefs, update_frequency,
@@ skipping 584 matching lines @@
       linked_ptr<ExternalExtensionProvider>(test_provider);
 }
 
 void ExtensionsServiceBackend::OnExternalExtensionFound(
     const std::string& id, const Version* version, const FilePath& path,
     Extension::Location location) {
   frontend_loop_->PostTask(FROM_HERE, NewRunnableMethod(frontend_,
       &ExtensionsService::OnExternalExtensionFound, id, version->GetString(),
       path, location));
 }