chrome/browser/extensions/extension_action_test_util.cc - Issue 1871713002: Convert //chrome/browser/extensions 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/extensions/extension_action_test_util.cc

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

Patch Set: Rebase and fix header 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/extensions/extension_action_storage_manager.cc ('k') | chrome/browser/extensions/extension_action_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action_test_util.cc

diff --git a/chrome/browser/extensions/extension_action_test_util.cc b/chrome/browser/extensions/extension_action_test_util.cc

index e622d8e3d9967342e88158ca9d1c5dafaf6de63e..b5104ff2b0b58df5fdf3c875bc64350aa7d846b4 100644

--- a/chrome/browser/extensions/extension_action_test_util.cc

+++ b/chrome/browser/extensions/extension_action_test_util.cc

@@ -4,7 +4,9 @@

#include "chrome/browser/extensions/extension_action_test_util.h"

-#include "base/memory/scoped_ptr.h"

+#include <memory>

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

#include "base/run_loop.h"

#include "chrome/browser/extensions/extension_action.h"

#include "chrome/browser/extensions/extension_action_manager.h"

@@ -77,8 +79,9 @@ size_t GetPageActionCount(content::WebContents* web_contents,

}

// Creates a new ToolbarActionsModel for the given |context|.

-scoped_ptr<KeyedService> BuildToolbarModel(content::BrowserContext* context) {

- return make_scoped_ptr(

+std::unique_ptr<KeyedService> BuildToolbarModel(

+ content::BrowserContext* context) {

+ return base::WrapUnique(

new ToolbarActionsModel(Profile::FromBrowserContext(context),

extensions::ExtensionPrefs::Get(context)));

}