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

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

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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/script_badge_controller_unittest.cc
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc
index ee17b9476910ad948efffc78f41fb9a6eba1819c..14ada0789d812e5c8c26244f91a9c0decf272029 100644
--- a/chrome/browser/extensions/script_badge_controller_unittest.cc
+++ b/chrome/browser/extensions/script_badge_controller_unittest.cc
@@ -85,7 +85,7 @@ class ScriptBadgeControllerTest : public ChromeRenderViewHostTestHarness {
.Set("page_action", DictionaryBuilder()
.Set("default_title", "Hello")))
.Build();
- extension_service_->AddExtension(extension);
+ extension_service_->AddExtension(extension.get());
return extension;
}
@@ -152,7 +152,7 @@ TEST_F(ScriptBadgeControllerTest, ExecutionMakesBadgeVisible) {
web_contents()->GetController().GetActiveEntry()->GetPageID(),
GURL(std::string()));
EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
- testing::ElementsAre(GetScriptBadge(*extension)));
+ testing::ElementsAre(GetScriptBadge(*extension.get())));
EXPECT_THAT(location_bar_updated.events, testing::Gt(0));
};
@@ -182,7 +182,7 @@ TEST_F(ScriptBadgeControllerTest, FragmentNavigation) {
GURL(std::string()));
EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
- testing::ElementsAre(GetScriptBadge(*extension)));
+ testing::ElementsAre(GetScriptBadge(*extension.get())));
EXPECT_EQ(1, location_bar_updated.events);
}
@@ -198,7 +198,7 @@ TEST_F(ScriptBadgeControllerTest, FragmentNavigation) {
NavigateAndCommit(GURL("http://www.google.com#hash"));
EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
- testing::ElementsAre(GetScriptBadge(*extension)));
+ testing::ElementsAre(GetScriptBadge(*extension.get())));
EXPECT_EQ(0, location_bar_updated.events);
}
@@ -230,7 +230,7 @@ TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) {
.Set("permissions", ListBuilder()
.Append("tabs")))
.Build();
- extension_service_->AddExtension(extension);
+ extension_service_->AddExtension(extension.get());
// Establish a page id.
NavigateAndCommit(GURL("http://www.google.com"));
@@ -251,7 +251,7 @@ TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) {
script_badge_controller_->GetAttentionFor(extension->id());
EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
- testing::ElementsAre(GetScriptBadge(*extension)));
+ testing::ElementsAre(GetScriptBadge(*extension.get())));
EXPECT_THAT(initial_badge_display.events, testing::Gt(0));
CountingNotificationObserver subsequent_get_attention_call;
@@ -264,7 +264,7 @@ TEST_F(ScriptBadgeControllerTest, GetAttentionMakesBadgeVisible) {
script_badge_controller_->GetAttentionFor(extension->id());
EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
- testing::ElementsAre(GetScriptBadge(*extension)));
+ testing::ElementsAre(GetScriptBadge(*extension.get())));
EXPECT_EQ(0, subsequent_get_attention_call.events);
};
« no previous file with comments | « chrome/browser/extensions/sandboxed_unpacker.cc ('k') | chrome/browser/extensions/script_bubble_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698