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

Index: chrome/browser/chromeos/policy/device_local_account.cc

diff --git a/chrome/browser/chromeos/policy/device_local_account.cc b/chrome/browser/chromeos/policy/device_local_account.cc

index e8cfa2cef5c490950f304db486cbe72f89efae4c..7f9672f9af236b2e7bcab67b5735794da463e188 100644

--- a/chrome/browser/chromeos/policy/device_local_account.cc

+++ b/chrome/browser/chromeos/policy/device_local_account.cc

@@ -6,11 +6,11 @@

#include <stddef.h>

+#include <memory>

#include <set>

#include "base/logging.h"

#include "base/macros.h"

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

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

#include "base/values.h"

@@ -101,7 +101,7 @@ void SetDeviceLocalAccounts(chromeos::OwnerSettingsServiceChromeOS* service,

base::ListValue list;

for (std::vector<DeviceLocalAccount>::const_iterator it = accounts.begin();

it != accounts.end(); ++it) {

- scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);

+ std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue);

entry->SetStringWithoutPathExpansion(

chromeos::kAccountsPrefDeviceLocalAccountsKeyId,

it->account_id);