chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc - Issue 2341693002: Re-write many calls to WrapUnique() with MakeUnique()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2341693002: Re-write many calls to WrapUnique() with MakeUnique() (Closed)

Patch Set: Change std::string() back to "" to fix compile Created 4 years, 3 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/chrome_content_client.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_platformapp_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 6e6d3d92fa77eaaf0168e8618d26eb04547dfb84..4a0b6f984c3528cfa3324c8896b14239653a8939 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

@@ -38,12 +38,11 @@ std::unique_ptr<ActionInfo> PageActionManifestTest::LoadAction(

const ActionInfo* page_action_info =

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

EXPECT_TRUE(page_action_info);

- if (page_action_info) {

- return base::WrapUnique(new ActionInfo(*page_action_info));

- }

+ if (page_action_info)

+ return base::MakeUnique<ActionInfo>(*page_action_info);

ADD_FAILURE() << "Expected manifest in " << manifest_filename

<< " to include a page_action section.";

- return std::unique_ptr<ActionInfo>();

+ return nullptr;

}

TEST_F(PageActionManifestTest, ManifestVersion2) {