Fix user scripts not getting initialized.

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/file_path.h"
 #include "base/file_util.h"
 #include "base/json_reader.h"
@@ skipping 120 matching lines @@
 
       default:
         DCHECK(false);
     }
   }
 
   void SetExtensionsEnabled(bool enabled) {
     service_->set_extensions_enabled(enabled);
   }
 
-  void TestInstallExtension(const FilePath& path,
-                            bool should_succeed) {
-    InstallExtension(path, should_succeed, false);
-  }
-
-  void TestInstallTheme(const FilePath& path,
-                        bool should_succeed) {
-    InstallExtension(path, should_succeed, true);
-  }
-
  protected:
   void InstallExtension(const FilePath& path,
-                        bool should_succeed,
-                        bool is_theme) {
+                        bool should_succeed) {
     ASSERT_TRUE(file_util::PathExists(path));
     service_->InstallExtension(path);
     loop_.RunAllPending();
     std::vector<std::string> errors = GetErrors();
     if (should_succeed) {
       ++total_successes_;
 
       EXPECT_TRUE(installed_) << path.value();
 
-      // Themes aren't loaded.
-      if (is_theme)
-        EXPECT_EQ(0u, loaded_.size()) << path.value();
-      else
-        EXPECT_EQ(1u, loaded_.size()) << path.value();
-
+      EXPECT_EQ(1u, loaded_.size()) << path.value();
       EXPECT_EQ(0u, errors.size()) << path.value();
       EXPECT_EQ(total_successes_, service_->extensions()->size()) <<
           path.value();
-      if (loaded_.size() > 0) {
-        EXPECT_TRUE(service_->GetExtensionByID(loaded_[0]->id())) <<
-            path.value();
-      }
+      EXPECT_TRUE(service_->GetExtensionByID(loaded_[0]->id())) <<
+          path.value();
       for (std::vector<std::string>::iterator err = errors.begin();
         err != errors.end(); ++err) {
         LOG(ERROR) << *err;
       }
     } else {
       EXPECT_FALSE(installed_) << path.value();
       EXPECT_EQ(1u, errors.size()) << path.value();
     }
 
     installed_ = NULL;
@@ skipping 198 matching lines @@
 
 // Test installing extensions.
 TEST_F(ExtensionsServiceTest, InstallExtension) {
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
 
   // Extensions not enabled.
   SetExtensionsEnabled(false);
   FilePath path = extensions_path.AppendASCII("good.crx");
-  TestInstallExtension(path, false);
+  InstallExtension(path, false);
   SetExtensionsEnabled(true);
 
   ValidatePrefKeyCount(0);
 
   // A simple extension that should install without error.
   path = extensions_path.AppendASCII("good.crx");
-  TestInstallExtension(path, true);
+  InstallExtension(path, true);
   // TODO(erikkay): verify the contents of the installed extension.
 
   int pref_count = 0;
   ValidatePrefKeyCount(++pref_count);
   ValidatePref(good_crx, L"state", Extension::ENABLED);
   ValidatePref(good_crx, L"location", Extension::INTERNAL);
 
   // An extension with page actions.
   path = extensions_path.AppendASCII("page_action.crx");
-  TestInstallExtension(path, true);
+  InstallExtension(path, true);
   ValidatePrefKeyCount(++pref_count);
   ValidatePref(page_action, L"state", Extension::ENABLED);
   ValidatePref(page_action, L"location", Extension::INTERNAL);
 
   // 0-length extension file.
   path = extensions_path.AppendASCII("not_an_extension.crx");
-  TestInstallExtension(path, false);
+  InstallExtension(path, false);
   ValidatePrefKeyCount(pref_count);
 
   // Bad magic number.
   path = extensions_path.AppendASCII("bad_magic.crx");
-  TestInstallExtension(path, false);
+  InstallExtension(path, false);
   ValidatePrefKeyCount(pref_count);
 
   // Poorly formed JSON.
   path = extensions_path.AppendASCII("bad_json.crx");
-  TestInstallExtension(path, false);
+  InstallExtension(path, false);
   ValidatePrefKeyCount(pref_count);
 
   // Incorrect zip hash.
   path = extensions_path.AppendASCII("bad_hash.crx");
-  TestInstallExtension(path, false);
+  InstallExtension(path, false);
   ValidatePrefKeyCount(pref_count);
 
   // TODO(erikkay): add more tests for many of the failure cases.
   // TODO(erikkay): add tests for upgrade cases.
 }
 
 TEST_F(ExtensionsServiceTest, InstallTheme) {
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
 
   // A theme.
   FilePath path = extensions_path.AppendASCII("theme.crx");
-  TestInstallTheme(path, true);
+  InstallExtension(path, true);
   int pref_count = 0;
   ValidatePrefKeyCount(++pref_count);
   ValidatePref(theme_crx, L"state", Extension::ENABLED);
   ValidatePref(theme_crx, L"location", Extension::INTERNAL);
 
   // A theme when extensions are disabled. Themes can be installed even though
   // extensions are disabled.
   SetExtensionsEnabled(false);
   path = extensions_path.AppendASCII("theme2.crx");
-  TestInstallTheme(path, true);
+  InstallExtension(path, true);
   ValidatePrefKeyCount(++pref_count);
   ValidatePref(theme2_crx, L"state", Extension::ENABLED);
   ValidatePref(theme2_crx, L"location", Extension::INTERNAL);
   SetExtensionsEnabled(true);
 
   // A theme with extension elements. Themes cannot have extension elements so
   // this test should fail.
   path = extensions_path.AppendASCII("theme_with_extension.crx");
-  TestInstallTheme(path, false);
+  InstallExtension(path, false);
   ValidatePrefKeyCount(pref_count);
 
   // A theme with image resources missing (misspelt path).
   path = extensions_path.AppendASCII("theme_missing_image.crx");
-  TestInstallTheme(path, false);
+  InstallExtension(path, false);
   ValidatePrefKeyCount(pref_count);
 }
 
 // Test that when an extension version is reinstalled, nothing happens.
 TEST_F(ExtensionsServiceTest, Reinstall) {
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
 
   // A simple extension that should install without error.
@@ skipping 25 matching lines @@
 }
 
 // Tests uninstalling normal extensions
 TEST_F(ExtensionsServiceTest, UninstallExtension) {
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
 
   // A simple extension that should install without error.
   FilePath path = extensions_path.AppendASCII("good.crx");
-  TestInstallExtension(path, true);
+  InstallExtension(path, true);
 
   // The directory should be there now.
   FilePath install_path = profile_->GetPath().AppendASCII("Extensions");
   const char* extension_id = good_crx;
   FilePath extension_path = install_path.AppendASCII(extension_id);
   EXPECT_TRUE(file_util::PathExists(extension_path));
 
   ValidatePrefKeyCount(1);
   ValidatePref(good_crx, L"state", Extension::ENABLED);
   ValidatePref(good_crx, L"location", Extension::INTERNAL);
@@ skipping 13 matching lines @@
   // The extension should not be in the service anymore.
   ASSERT_FALSE(service_->GetExtensionByID(extension_id));
   loop_.RunAllPending();
 
   // The directory should be gone.
   EXPECT_FALSE(file_util::PathExists(extension_path));
 
   // Try uinstalling one that doesn't have a Current Version file for some
   // reason.
   unloaded_id_.clear();
-  TestInstallExtension(path, true);
+  InstallExtension(path, true);
   FilePath current_version_file =
       extension_path.AppendASCII(ExtensionsService::kCurrentVersionFileName);
   EXPECT_TRUE(file_util::Delete(current_version_file, true));
   service_->UninstallExtension(extension_id);
   loop_.RunAllPending();
   EXPECT_FALSE(file_util::PathExists(extension_path));
 
   ValidatePrefKeyCount(1);
   ValidatePref(good_crx, L"state", Extension::DISABLED);
   ValidatePref(good_crx, L"location", Extension::INTERNAL);
@@ skipping 279 matching lines @@
   ValidatePrefKeyCount(1);
   ValidatePref(good_crx, L"state", Extension::KILLBIT);
   ValidatePref(good_crx, L"location", Extension::EXTERNAL_PREF);
 
   // The extension should also be gone from disk.
   FilePath extension_path = install_path.DirName();
   extension_path = extension_path.AppendASCII(good_crx);
   EXPECT_FALSE(file_util::PathExists(extension_path)) <<
       extension_path.ToWStringHack();
 }