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

Unified Diff: chrome/browser/profile_resetter/profile_resetter_unittest.cc

Issue 196753002: [Hotword] Making enabling/disabling the setting enable/disable the hotword extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase because try bots are hanging Created 6 years, 9 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
« no previous file with comments | « chrome/browser/extensions/component_loader_unittest.cc ('k') | chrome/browser/search/hotword_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profile_resetter/profile_resetter_unittest.cc
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index f9055d6d7fb4cb78cbee51e10c1a2cdc85c4d6fe..6f0c79c136a4513fadef6c671809251d4e360bb6 100644
--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -617,6 +617,8 @@ TEST_F(ProfileResetterTest, ResetExtensionsByDisabling) {
extensions::Manifest::TYPE_EXTENSION,
false);
service_->AddExtension(ext4.get());
+ // External component extensions are the exception as they can be disabled
+ // and should not be re-enabled on reset if they have been disabled.
battre 2014/03/14 09:23:15 Could you explain me how these external component
rpetterson 2014/03/14 16:31:28 The update urls are hard coded (most as constants)
scoped_refptr<Extension> ext5 = CreateExtension(
base::ASCIIToUTF16("example5"),
base::FilePath(FILE_PATH_LITERAL("//nonexistent4")),
@@ -634,12 +636,12 @@ TEST_F(ProfileResetterTest, ResetExtensionsByDisabling) {
EXPECT_EQ(6u, service_->extensions()->size());
ResetAndWait(ProfileResetter::EXTENSIONS);
- EXPECT_EQ(4u, service_->extensions()->size());
+ EXPECT_EQ(3u, service_->extensions()->size());
EXPECT_FALSE(service_->extensions()->Contains(theme->id()));
EXPECT_FALSE(service_->extensions()->Contains(ext2->id()));
EXPECT_TRUE(service_->extensions()->Contains(ext3->id()));
EXPECT_TRUE(service_->extensions()->Contains(ext4->id()));
- EXPECT_TRUE(service_->extensions()->Contains(ext5->id()));
+ EXPECT_FALSE(service_->extensions()->Contains(ext5->id()));
EXPECT_TRUE(service_->extensions()->Contains(ext6->id()));
EXPECT_TRUE(theme_service->UsingDefaultTheme());
}
« no previous file with comments | « chrome/browser/extensions/component_loader_unittest.cc ('k') | chrome/browser/search/hotword_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698