chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc - Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Unified Diff: chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc

Issue 15836003: 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

« no previous file with comments | « chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc ('k') | chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc

diff --git a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc

index 77374aceb26f5c199e61c5366a8b45d86369381d..15d61d8bbd99365eaba0d16c72e629da3d5f62ec 100644

--- a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc

+++ b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc

@@ -27,7 +27,8 @@ scoped_ptr<ActionInfo> PageActionManifestTest::LoadAction(

const std::string& manifest_filename) {

scoped_refptr<Extension> extension = LoadAndExpectSuccess(

manifest_filename.c_str());

- const ActionInfo* page_action_info = ActionInfo::GetPageActionInfo(extension);

+ const ActionInfo* page_action_info =

+ ActionInfo::GetPageActionInfo(extension.get());

EXPECT_TRUE(page_action_info);

if (page_action_info) {

return make_scoped_ptr(new ActionInfo(*page_action_info));

@@ -40,8 +41,9 @@ scoped_ptr<ActionInfo> PageActionManifestTest::LoadAction(

TEST_F(PageActionManifestTest, ManifestVersion2) {

scoped_refptr<Extension> extension(

LoadAndExpectSuccess("page_action_manifest_version_2.json"));

- ASSERT_TRUE(extension);

- const ActionInfo* page_action_info = ActionInfo::GetPageActionInfo(extension);

+ ASSERT_TRUE(extension.get());

+ const ActionInfo* page_action_info =

+ ActionInfo::GetPageActionInfo(extension.get());

ASSERT_TRUE(page_action_info);

EXPECT_EQ("", page_action_info->id);

@@ -121,7 +123,8 @@ TEST_F(PageActionManifestTest, LoadPageActionHelper) {

// Only use "popup", expect success.

scoped_refptr<Extension> extension =

LoadAndExpectSuccess("page_action_popup.json");

- const ActionInfo* extension_action = ActionInfo::GetPageActionInfo(extension);

+ const ActionInfo* extension_action =

+ ActionInfo::GetPageActionInfo(extension.get());

ASSERT_TRUE(extension_action);

ASSERT_STREQ(

extension->url().Resolve(kPopupHtmlFile).spec().c_str(),

@@ -136,7 +139,7 @@ TEST_F(PageActionManifestTest, LoadPageActionHelper) {

// Use only "default_popup", expect success.

extension = LoadAndExpectSuccess("page_action_popup.json");

- extension_action = ActionInfo::GetPageActionInfo(extension);

+ extension_action = ActionInfo::GetPageActionInfo(extension.get());

ASSERT_TRUE(extension_action);

ASSERT_STREQ(

extension->url().Resolve(kPopupHtmlFile).spec().c_str(),