chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm - 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/cocoa/infobars/infobar_container_controller_unittest.mm

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/cocoa/infobars/infobar_container_controller.h ('k') | chrome/browser/ui/cocoa/infobars/save_password_infobar_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm

index 6de886a37d05bb34060906e5584d36ce5e258b3c..57b43d91156f31c7186f204d8f220f67bc25980a 100644

--- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm

@@ -46,7 +46,7 @@ class InfoBarContainerControllerTest : public CocoaProfileTest {

public:

base::scoped_nsobject<ViewResizerPong> resizeDelegate_;

base::scoped_nsobject<InfoBarContainerController> controller_;

- scoped_ptr<content::WebContents> web_contents_;

+ std::unique_ptr<content::WebContents> web_contents_;

};

TEST_VIEW(InfoBarContainerControllerTest, [controller_ view])

@@ -62,9 +62,9 @@ TEST_F(InfoBarContainerControllerTest, BWCPong) {

TEST_F(InfoBarContainerControllerTest, AddAndRemoveInfoBars) {

NSView* view = [controller_ view];

- scoped_ptr<infobars::InfoBarDelegate> confirm_delegate(

+ std::unique_ptr<infobars::InfoBarDelegate> confirm_delegate(

new MockConfirmInfoBarDelegate(NULL));

- scoped_ptr<InfoBarCocoa> infobar(

+ std::unique_ptr<InfoBarCocoa> infobar(

new InfoBarCocoa(std::move(confirm_delegate)));

base::scoped_nsobject<ConfirmInfoBarController> controller(

[[ConfirmInfoBarController alloc] initWithInfoBar:infobar.get()]);