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

Index: chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm

index cde8d81b265b377cbfe764c4613f00fbcce7d3d8..df7df672f8aaaf60db9e8f0556edb838b0e3afa9 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm

@@ -9,6 +9,7 @@

#include "base/mac/bundle_locations.h"

#include "base/mac/foundation_util.h"

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "base/path_service.h"

#include "base/strings/sys_string_conversions.h"

#include "chrome/browser/ui/browser.h"

@@ -197,10 +198,11 @@ ToolbarActionsBar* BrowserActionTestUtil::GetToolbarActionsBar() {

return [GetController(browser_, test_helper_.get()) toolbarActionsBar];

}

-scoped_ptr<BrowserActionTestUtil> BrowserActionTestUtil::CreateOverflowBar() {

+std::unique_ptr<BrowserActionTestUtil>

+BrowserActionTestUtil::CreateOverflowBar() {

CHECK(!GetToolbarActionsBar()->in_overflow_mode())

<< "Only a main bar can create an overflow bar!";

- return make_scoped_ptr(new BrowserActionTestUtil(browser_, this));

+ return base::WrapUnique(new BrowserActionTestUtil(browser_, this));

}

// static