| 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 b487a469c5482c3b920af0ec0c6cbfea8a302339..b34d6bed85d9a529005da489a61b7ba0d7d7854f 100644
|
| --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| @@ -29,6 +29,7 @@
|
| #include "components/search_engines/template_url_service_client.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/test/test_browser_thread.h"
|
| +#include "extensions/browser/extension_registry.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/manifest_constants.h"
|
| #include "net/http/http_response_headers.h"
|
| @@ -628,16 +629,16 @@ TEST_F(ProfileResetterTest, ResetExtensionsByDisabling) {
|
| extensions::Manifest::TYPE_EXTENSION,
|
| false);
|
| service_->AddExtension(ext6.get());
|
| - EXPECT_EQ(6u, service_->extensions()->size());
|
| + EXPECT_EQ(6u, registry()->enabled_extensions().size());
|
|
|
| ResetAndWait(ProfileResetter::EXTENSIONS);
|
| - EXPECT_EQ(4u, 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_TRUE(service_->extensions()->Contains(ext6->id()));
|
| + EXPECT_EQ(4u, registry()->enabled_extensions().size());
|
| + EXPECT_FALSE(registry()->enabled_extensions().Contains(theme->id()));
|
| + EXPECT_FALSE(registry()->enabled_extensions().Contains(ext2->id()));
|
| + EXPECT_TRUE(registry()->enabled_extensions().Contains(ext3->id()));
|
| + EXPECT_TRUE(registry()->enabled_extensions().Contains(ext4->id()));
|
| + EXPECT_TRUE(registry()->enabled_extensions().Contains(ext5->id()));
|
| + EXPECT_TRUE(registry()->enabled_extensions().Contains(ext6->id()));
|
| EXPECT_TRUE(theme_service->UsingDefaultTheme());
|
| }
|
|
|
| @@ -657,15 +658,15 @@ TEST_F(ProfileResetterTest, ResetExtensionsByDisablingNonOrganic) {
|
| extensions::Manifest::TYPE_EXTENSION,
|
| false);
|
| service_->AddExtension(ext3.get());
|
| - EXPECT_EQ(2u, service_->extensions()->size());
|
| + EXPECT_EQ(2u, registry()->enabled_extensions().size());
|
|
|
| std::string master_prefs(kDistributionConfig);
|
| ReplaceString(&master_prefs, "placeholder_for_id", ext3->id());
|
|
|
| ResetAndWait(ProfileResetter::EXTENSIONS, master_prefs);
|
|
|
| - EXPECT_EQ(1u, service_->extensions()->size());
|
| - EXPECT_TRUE(service_->extensions()->Contains(ext3->id()));
|
| + EXPECT_EQ(1u, registry()->enabled_extensions().size());
|
| + EXPECT_TRUE(registry()->enabled_extensions().Contains(ext3->id()));
|
| }
|
|
|
| TEST_F(ProfileResetterTest, ResetExtensionsAndDefaultApps) {
|
| @@ -703,14 +704,14 @@ TEST_F(ProfileResetterTest, ResetExtensionsAndDefaultApps) {
|
| extensions::Manifest::TYPE_HOSTED_APP,
|
| true);
|
| service_->AddExtension(ext3.get());
|
| - EXPECT_EQ(3u, service_->extensions()->size());
|
| + EXPECT_EQ(3u, registry()->enabled_extensions().size());
|
|
|
| ResetAndWait(ProfileResetter::EXTENSIONS);
|
|
|
| - EXPECT_EQ(1u, service_->extensions()->size());
|
| - EXPECT_FALSE(service_->extensions()->Contains(ext1->id()));
|
| - EXPECT_FALSE(service_->extensions()->Contains(ext2->id()));
|
| - EXPECT_TRUE(service_->extensions()->Contains(ext3->id()));
|
| + EXPECT_EQ(1u, registry()->enabled_extensions().size());
|
| + EXPECT_FALSE(registry()->enabled_extensions().Contains(ext1->id()));
|
| + EXPECT_FALSE(registry()->enabled_extensions().Contains(ext2->id()));
|
| + EXPECT_TRUE(registry()->enabled_extensions().Contains(ext3->id()));
|
| EXPECT_TRUE(theme_service->UsingDefaultTheme());
|
| }
|
|
|
|
|