Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 19462009: [DRAFT] Allow a user to revert to their previous theme without closing infobar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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");

Powered by Google App Engine
This is Rietveld 408576698