Re-enable the --enable-extensions flag. Fix a bunch of bugs

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"
 #include "base/json_reader.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/external_extension_provider.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 // Extension ids used during testing.
 const char* const all_zero = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 const char* const zero_n_one = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab";
 const char* const good0 = "behllobkkfkfnphdnhnkndlbkcpglgmj";
@@ skipping 86 matching lines @@
     registrar_.Add(this, NotificationType::EXTENSIONS_LOADED,
                    NotificationService::AllSources());
     registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                    NotificationService::AllSources());
     registrar_.Add(this, NotificationType::EXTENSION_INSTALLED,
                    NotificationService::AllSources());
     registrar_.Add(this, NotificationType::THEME_INSTALLED,
                    NotificationService::AllSources());
 
     profile_.reset(new TestingProfile());
-    service_ = new ExtensionsService(profile_.get(), &loop_, &loop_);
+    service_ = new ExtensionsService(
+        profile_.get(), CommandLine::ForCurrentProcess(), &loop_, &loop_);
     service_->SetExtensionsEnabled(true);
     service_->set_show_extensions_prompts(false);
 
     // When we start up, we want to make sure there is no external provider,
     // since the ExtensionService on Windows will use the Registry as a default
     // provider and if there is something already registered there then it will
     // interfere with the tests. Those tests that need an external provider
     // will register one specifically.
     service_->ClearProvidersForTesting();
 
@@ skipping 872 matching lines @@
   // This shouldn't work if extensions are disabled.
   SetExtensionsEnabled(false);
 
   pref_provider->UpdateOrAddExtension(good_crx, "1.0", source_path);
   service_->CheckForUpdates();
   loop_.RunAllPending();
 
   ASSERT_EQ(0u, loaded_.size());
   ASSERT_EQ(1u, GetErrors().size());
 }
+
+// Test that we get enabled/disabled correctly for all the pref/command-line
+// combinations.
+TEST(ExtensionsServiceTest2, Enabledness) {
+  TestingProfile profile;
+  MessageLoop loop;
+  scoped_ptr<CommandLine> command_line;
+  scoped_refptr<ExtensionsService> service;
+
+  // By default, we are disabled.
+  command_line.reset(new CommandLine(L""));
+  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
+  EXPECT_FALSE(service->extensions_enabled());
+
+  // If either the command line or pref is set, we are enabled.
+  command_line->AppendSwitch(switches::kEnableExtensions);
+  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
+  EXPECT_TRUE(service->extensions_enabled());
+
+  profile.GetPrefs()->SetBoolean(prefs::kEnableExtensions, true);
+  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
+  EXPECT_TRUE(service->extensions_enabled());
+
+  command_line.reset(new CommandLine(L""));
+  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
+  EXPECT_TRUE(service->extensions_enabled());
+}