chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/settings/scoped_cros_settings_test_helper.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/settings/scoped_cros_settings_test_helper.h ('k') | chrome/browser/chromeos/settings/session_manager_operation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc

diff --git a/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc

index bcbb947e90d29aca4d129d47524ee0b5d96964c0..bf1fcf652adac954bde6ed2ef017185b48844c93 100644

--- a/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc

+++ b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"

#include "base/logging.h"

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

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/ownership/fake_owner_settings_service.h"

@@ -33,9 +34,9 @@ ScopedCrosSettingsTestHelper::~ScopedCrosSettingsTestHelper() {

RestoreProvider();

}

-scoped_ptr<FakeOwnerSettingsService>

+std::unique_ptr<FakeOwnerSettingsService>

ScopedCrosSettingsTestHelper::CreateOwnerSettingsService(Profile* profile) {

- return make_scoped_ptr(new FakeOwnerSettingsService(

+ return base::WrapUnique(new FakeOwnerSettingsService(

profile, new ownership::MockOwnerKeyUtil(), &stub_settings_provider_));

}