The extensions service wasn't getting inited despite being used by themes (th...

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 111 matching lines @@
         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) {
     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();
-      EXPECT_EQ(1u, loaded_.size()) << 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(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();
       }
       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;
     loaded_.clear();
     ExtensionErrorReporter::GetInstance()->ClearErrors();
   }
 
- protected:
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<ExtensionsService> service_;
   size_t total_successes_;
   MessageLoop loop_;
   std::vector<Extension*> loaded_;
   std::string unloaded_id_;
   Extension* installed_;
   std::string registry_path_;
 
  private:
@@ skipping 175 matching lines @@
   // 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");
-  TestInstallExtension(path, true);
+  TestInstallTheme(path, true);
 
   // A theme when extensions are disabled.
   SetExtensionsEnabled(false);
   path = extensions_path.AppendASCII("theme2.crx");
-  TestInstallExtension(path, true);
+  TestInstallTheme(path, true);
   SetExtensionsEnabled(true);
 
   // A theme with extension elements.
   path = extensions_path.AppendASCII("theme_with_extension.crx");
-  TestInstallExtension(path, false);
+  TestInstallTheme(path, false);
 }
 
 // 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.
   FilePath path = extensions_path.AppendASCII("good.crx");
@@ skipping 194 matching lines @@
   service_->Init();
   loop_.RunAllPending();
   ASSERT_EQ(0u, loaded_.size());
 }
 
 #else
 
 // TODO(port)
 
 #endif