diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:15:09 +0000 |
commit | dc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch) | |
tree | 8d7c684afa0d65e22efc3384197ef5b50d867160 /chrome/browser/extensions/script_badge_controller_unittest.cc | |
parent | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff) | |
download | chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2 |
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 2 of N
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16295003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/script_badge_controller_unittest.cc')
-rw-r--r-- | chrome/browser/extensions/script_badge_controller_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc index ee17b94..14ada07 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); }; |