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

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

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

index 8b2283ac93af1ff3e0725577d74f06a3063a779c..317bbcb4992fddebb45f8d9f6830fc35ab5b166e 100644

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

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

@@ -134,7 +134,8 @@ void SessionManagerOperation::RetrieveDeviceSettings() {

void SessionManagerOperation::ValidateDeviceSettings(

const std::string& policy_blob) {

- scoped_ptr<em::PolicyFetchResponse> policy(new em::PolicyFetchResponse());

+ std::unique_ptr<em::PolicyFetchResponse> policy(

+ new em::PolicyFetchResponse());

if (policy_blob.empty()) {

ReportResult(DeviceSettingsService::STORE_NO_POLICY);

return;

@@ -219,7 +220,7 @@ void LoadSettingsOperation::Run() {

StoreSettingsOperation::StoreSettingsOperation(

const Callback& callback,

- scoped_ptr<em::PolicyFetchResponse> policy)

+ std::unique_ptr<em::PolicyFetchResponse> policy)

: SessionManagerOperation(callback),

policy_(std::move(policy)),

weak_factory_(this) {}