Index: chrome/browser/extensions/extension_service_unittest.cc |
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc |
index 86dd4f1f119695222cdd7c820a343231d0fb7944..ed01005d95301f2836dda4fe0c74f0a9847dfee3 100644 |
--- a/chrome/browser/extensions/extension_service_unittest.cc |
+++ b/chrome/browser/extensions/extension_service_unittest.cc |
@@ -834,7 +834,9 @@ class ExtensionServiceTest |
EXPECT_EQ(0u, loaded_.size()) << path.value(); |
} else { |
EXPECT_EQ(1u, loaded_.size()) << path.value(); |
- EXPECT_EQ(expected_extensions_count_, service_->extensions()->size()) << |
+ size_t actual_extension_count = service_->extensions()->size() + |
+ service_->disabled_extensions()->size(); |
+ EXPECT_EQ(expected_extensions_count_, actual_extension_count) << |
path.value(); |
extension = loaded_[0].get(); |
EXPECT_TRUE(service_->GetExtensionById(extension->id(), false)) |
@@ -2354,6 +2356,7 @@ TEST_F(ExtensionServiceTest, PackExtensionOpenSSLKey) { |
TEST_F(ExtensionServiceTest, InstallTheme) { |
InitializeEmptyExtensionService(); |
+ service_->Init(); |
// A theme. |
base::FilePath path = data_dir_.AppendASCII("theme.crx"); |
@@ -2395,6 +2398,8 @@ TEST_F(ExtensionServiceTest, InstallTheme) { |
TEST_F(ExtensionServiceTest, LoadLocalizedTheme) { |
// Load. |
InitializeEmptyExtensionService(); |
+ service_->Init(); |
+ |
base::FilePath extension_path = data_dir_ |
.AppendASCII("theme_i18n"); |
@@ -2495,6 +2500,8 @@ TEST_F(ExtensionServiceTest, UnpackedExtensionMayContainSymlinkedFiles) { |
TEST_F(ExtensionServiceTest, InstallLocalizedTheme) { |
InitializeEmptyExtensionService(); |
+ service_->Init(); |
+ |
base::FilePath theme_path = data_dir_ |
.AppendASCII("theme_i18n"); |