chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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/browser/ui/extensions/extension_action_view_controller_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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/ui/extensions/extension_action_view_controller.cc ('k') | chrome/browser/ui/extensions/extension_enable_flow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc

diff --git a/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc b/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc

index cc4a2aa7e2e857aa68abebd3d8a19b1aa2eaa6b8..c0e665dc8206da48c87333887fca188c514910b1 100644

--- a/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc

+++ b/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc

@@ -33,7 +33,7 @@ TEST_P(ToolbarActionsBarUnitTest, ExtensionActionNormalAppearance) {

ExtensionActionViewController* action =

static_cast<ExtensionActionViewController*>(

toolbar_actions_bar()->GetActions()[0]);

- scoped_ptr<IconWithBadgeImageSource> image_source =

+ std::unique_ptr<IconWithBadgeImageSource> image_source =

action->GetIconImageSourceForTesting(web_contents, size);

EXPECT_FALSE(image_source->grayscale());

EXPECT_FALSE(image_source->paint_page_action_decoration());

@@ -75,7 +75,7 @@ TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionWantsToRunAppearance) {

ExtensionActionViewController* action =

static_cast<ExtensionActionViewController*>(

toolbar_actions_bar()->GetActions()[0]);

- scoped_ptr<IconWithBadgeImageSource> image_source =

+ std::unique_ptr<IconWithBadgeImageSource> image_source =

action->GetIconImageSourceForTesting(web_contents, size);

EXPECT_TRUE(image_source->grayscale());

EXPECT_FALSE(image_source->paint_page_action_decoration());

@@ -123,7 +123,7 @@ TEST_P(ToolbarActionsBarRedesignUnitTest, ExtensionActionBlockedActions) {

ASSERT_TRUE(web_contents);

const gfx::Size kSize(ToolbarActionsBar::IconWidth(false),

ToolbarActionsBar::IconHeight());

- scoped_ptr<IconWithBadgeImageSource> image_source =

+ std::unique_ptr<IconWithBadgeImageSource> image_source =

browser_action->GetIconImageSourceForTesting(web_contents, kSize);

EXPECT_FALSE(image_source->grayscale());

EXPECT_FALSE(image_source->paint_page_action_decoration());