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

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

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 add357aee4fa57be61c6e388b3b146d820d6192f..477f36acdcd5b0783772989ff7967924149aa02b 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -456,8 +456,7 @@ void ExtensionServiceTestBase::InitializeExtensionService(
TestingProfile::Builder profile_builder;
// Create a PrefService that only contains user defined preference values.
PrefServiceMockBuilder builder;
- builder.WithUserFilePrefs(
- params.pref_file, loop_.message_loop_proxy());
+ builder.WithUserFilePrefs(params.pref_file, loop_.message_loop_proxy().get());
scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
new user_prefs::PrefRegistrySyncable);
scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry.get()));
@@ -479,7 +478,7 @@ void ExtensionServiceTestBase::InitializeExtensionService(
CommandLine::ForCurrentProcess(),
params.extensions_install_dir,
params.autoupdate_enabled);
- service_->SetFileTaskRunnerForTesting(loop_.message_loop_proxy());
+ service_->SetFileTaskRunnerForTesting(loop_.message_loop_proxy().get());
service_->set_extensions_enabled(true);
service_->set_show_extensions_prompts(false);
service_->set_install_updates_when_idle_for_test(false);
@@ -1880,7 +1879,7 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) {
service_->ReloadExtensions();
EXPECT_EQ(1u, service_->disabled_extensions()->size());
- extension = *service_->disabled_extensions()->begin();
+ extension = service_->disabled_extensions()->begin()->get();
ASSERT_TRUE(prefs->IsExtensionDisabled(extension_id));
ASSERT_FALSE(service_->IsExtensionEnabled(extension_id));
@@ -1923,7 +1922,7 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) {
service_->ReloadExtensions();
EXPECT_EQ(1u, service_->disabled_extensions()->size());
- extension = *service_->disabled_extensions()->begin();
+ extension = service_->disabled_extensions()->begin()->get();
ASSERT_TRUE(prefs->IsExtensionDisabled(extension_id));
ASSERT_FALSE(service_->IsExtensionEnabled(extension_id));
@@ -2198,7 +2197,7 @@ TEST_F(ExtensionServiceTest, LoadLocalizedTheme) {
EXPECT_EQ(0u, GetErrors().size());
ASSERT_EQ(1u, loaded_.size());
EXPECT_EQ(1u, service_->extensions()->size());
- const Extension* theme = *service_->extensions()->begin();
+ const Extension* theme = service_->extensions()->begin()->get();
EXPECT_EQ("name", theme->name());
EXPECT_EQ("description", theme->description());
@@ -3394,7 +3393,7 @@ TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsLoadFromPrefs) {
extensions::InstalledLoader(service_).Load(extension_info, false);
EXPECT_EQ(1u, service_->extensions()->size());
- const Extension* extension = *(service_->extensions()->begin());
+ const Extension* extension = (service_->extensions()->begin())->get();
EXPECT_TRUE(service_->UninstallExtension(extension->id(), false, NULL));
EXPECT_EQ(0u, service_->extensions()->size());
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/extension_special_storage_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698