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

Unified Diff: chrome/browser/background/background_mode_manager_unittest.cc

Issue 510453002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/background/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/background/background_mode_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/background/background_mode_manager_unittest.cc
diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc
index e1327aae8c55a987c0323c8e76773236fde48f9f..5f6348b88657f8ec0c7dab20b26bac16a775c1c4 100644
--- a/chrome/browser/background/background_mode_manager_unittest.cc
+++ b/chrome/browser/background/background_mode_manager_unittest.cc
@@ -607,10 +607,10 @@ TEST_F(BackgroundModeManagerWithExtensionsTest, BackgroundMenuGeneration) {
extensions::ExtensionSystem::Get(profile_)->extension_service();
service->Init();
- service->AddComponentExtension(component_extension);
- service->AddComponentExtension(component_extension_with_options);
- service->AddExtension(regular_extension);
- service->AddExtension(regular_extension_with_options);
+ service->AddComponentExtension(component_extension.get());
+ service->AddComponentExtension(component_extension_with_options.get());
+ service->AddExtension(regular_extension.get());
+ service->AddExtension(regular_extension_with_options.get());
scoped_ptr<StatusIconMenuModel> menu(new StatusIconMenuModel(NULL));
scoped_ptr<StatusIconMenuModel> submenu(new StatusIconMenuModel(NULL));
@@ -685,10 +685,10 @@ TEST_F(BackgroundModeManagerWithExtensionsTest,
extensions::ExtensionSystem::Get(profile_)->extension_service();
service1->Init();
- service1->AddComponentExtension(component_extension);
- service1->AddComponentExtension(component_extension_with_options);
- service1->AddExtension(regular_extension);
- service1->AddExtension(regular_extension_with_options);
+ service1->AddComponentExtension(component_extension.get());
+ service1->AddComponentExtension(component_extension_with_options.get());
+ service1->AddExtension(regular_extension.get());
+ service1->AddExtension(regular_extension_with_options.get());
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile2))->CreateExtensionService(
@@ -699,9 +699,9 @@ TEST_F(BackgroundModeManagerWithExtensionsTest,
extensions::ExtensionSystem::Get(profile2)->extension_service();
service2->Init();
- service2->AddComponentExtension(component_extension);
- service2->AddExtension(regular_extension);
- service2->AddExtension(regular_extension_with_options);
+ service2->AddComponentExtension(component_extension.get());
+ service2->AddExtension(regular_extension.get());
+ service2->AddExtension(regular_extension_with_options.get());
manager_->RegisterProfile(profile2);
@@ -858,21 +858,21 @@ TEST_F(BackgroundModeManagerWithExtensionsTest, BalloonDisplay) {
// Adding a background extension should show the balloon.
EXPECT_FALSE(manager_->HasShownBalloon());
- service->AddExtension(bg_ext);
+ service->AddExtension(bg_ext.get());
EXPECT_TRUE(manager_->HasShownBalloon());
// Adding an extension without background should not show the balloon.
manager_->SetHasShownBalloon(false);
- service->AddExtension(no_bg_ext);
+ service->AddExtension(no_bg_ext.get());
EXPECT_FALSE(manager_->HasShownBalloon());
// Upgrading an extension that has background should not reshow the balloon.
- service->AddExtension(upgraded_bg_ext);
+ service->AddExtension(upgraded_bg_ext.get());
EXPECT_FALSE(manager_->HasShownBalloon());
// Upgrading an extension that didn't have background to one that does should
// show the balloon.
- service->AddExtension(upgraded_no_bg_ext_has_bg);
+ service->AddExtension(upgraded_no_bg_ext_has_bg.get());
EXPECT_TRUE(manager_->HasShownBalloon());
// Installing an ephemeral app should not show the balloon.
« no previous file with comments | « chrome/browser/background/background_mode_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698