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

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

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

index 44dd4e65ba8066478a31b6e22011e98b3da0a115..d253849b2a55b935554c48bee8f2ac6d3b9b8417 100644

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

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

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

#include "chrome/browser/chromeos/policy/device_local_account_external_data_manager.h"

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

+#include <memory>

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

#include "base/sequenced_task_runner.h"

#include "chrome/browser/chromeos/policy/cloud_external_data_store.h"

#include "chrome/browser/chromeos/policy/device_local_account_external_data_service.h"

@@ -22,13 +24,13 @@ DeviceLocalAccountExternalDataManager::DeviceLocalAccountExternalDataManager(

: CloudExternalDataManagerBase(get_policy_details,

backend_task_runner,

io_task_runner) {

- SetExternalDataStore(make_scoped_ptr(new CloudExternalDataStore(

+ SetExternalDataStore(base::WrapUnique(new CloudExternalDataStore(

account_id, backend_task_runner, resource_cache)));

}

DeviceLocalAccountExternalDataManager::

~DeviceLocalAccountExternalDataManager() {

- SetExternalDataStore(scoped_ptr<CloudExternalDataStore>());

+ SetExternalDataStore(std::unique_ptr<CloudExternalDataStore>());

}

void DeviceLocalAccountExternalDataManager::OnPolicyStoreLoaded() {