Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2732)

Unified Diff: chrome/browser/chromeos/policy/device_local_account_policy_service.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
Index: chrome/browser/chromeos/policy/device_local_account_policy_service.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
index 6eed5784bca5247b9077557a6e2fb3fa79fa22c0..c099cced9c5cce1126c89e0c7a2a841338d653cf 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
@@ -54,7 +54,7 @@ namespace {
// Creates and initializes a cloud policy client. Returns nullptr if the device
// is not enterprise-enrolled.
-scoped_ptr<CloudPolicyClient> CreateClient(
+std::unique_ptr<CloudPolicyClient> CreateClient(
chromeos::DeviceSettingsService* device_settings_service,
DeviceManagementService* device_management_service,
scoped_refptr<net::URLRequestContextGetter> system_request_context) {
@@ -62,17 +62,16 @@ scoped_ptr<CloudPolicyClient> CreateClient(
if (!policy_data ||
GetManagementMode(*policy_data) != MANAGEMENT_MODE_ENTERPRISE_MANAGED ||
!device_management_service) {
- return scoped_ptr<CloudPolicyClient>();
+ return std::unique_ptr<CloudPolicyClient>();
}
scoped_refptr<net::URLRequestContextGetter> request_context =
new SystemPolicyRequestContext(
system_request_context, GetUserAgent());
- scoped_ptr<CloudPolicyClient> client(
- new CloudPolicyClient(std::string(), std::string(),
- kPolicyVerificationKeyHash,
- device_management_service, request_context));
+ std::unique_ptr<CloudPolicyClient> client(new CloudPolicyClient(
+ std::string(), std::string(), kPolicyVerificationKeyHash,
+ device_management_service, request_context));
client->SetupRegistration(policy_data->request_token(),
policy_data->device_id());
return client;
@@ -119,7 +118,7 @@ void DeleteObsoleteExtensionCache(const std::string& account_id_to_delete) {
DeviceLocalAccountPolicyBroker::DeviceLocalAccountPolicyBroker(
const DeviceLocalAccount& account,
const base::FilePath& component_policy_cache_path,
- scoped_ptr<DeviceLocalAccountPolicyStore> store,
+ std::unique_ptr<DeviceLocalAccountPolicyStore> store,
scoped_refptr<DeviceLocalAccountExternalDataManager> external_data_manager,
const base::Closure& policy_update_callback,
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
@@ -175,9 +174,8 @@ void DeviceLocalAccountPolicyBroker::ConnectIfPossible(
if (core_.client())
return;
- scoped_ptr<CloudPolicyClient> client(CreateClient(device_settings_service,
- device_management_service,
- request_context));
+ std::unique_ptr<CloudPolicyClient> client(CreateClient(
+ device_settings_service, device_management_service, request_context));
if (!client)
return;
@@ -233,7 +231,7 @@ void DeviceLocalAccountPolicyBroker::CreateComponentCloudPolicyService(
return;
}
- scoped_ptr<ResourceCache> resource_cache(
+ std::unique_ptr<ResourceCache> resource_cache(
new ResourceCache(component_policy_cache_path_,
content::BrowserThread::GetMessageLoopProxyForThread(
content::BrowserThread::FILE)));
@@ -445,7 +443,7 @@ void DeviceLocalAccountPolicyService::UpdateAccountList() {
it != device_local_accounts.end(); ++it) {
PolicyBrokerMap::iterator broker_it = old_policy_brokers.find(it->user_id);
- scoped_ptr<DeviceLocalAccountPolicyBroker> broker;
+ std::unique_ptr<DeviceLocalAccountPolicyBroker> broker;
bool broker_initialized = false;
if (broker_it != old_policy_brokers.end()) {
// Reuse the existing broker if present.
@@ -453,11 +451,10 @@ void DeviceLocalAccountPolicyService::UpdateAccountList() {
old_policy_brokers.erase(broker_it);
broker_initialized = true;
} else {
- scoped_ptr<DeviceLocalAccountPolicyStore> store(
- new DeviceLocalAccountPolicyStore(it->account_id,
- session_manager_client_,
- device_settings_service_,
- store_background_task_runner_));
+ std::unique_ptr<DeviceLocalAccountPolicyStore> store(
+ new DeviceLocalAccountPolicyStore(
+ it->account_id, session_manager_client_, device_settings_service_,
+ store_background_task_runner_));
scoped_refptr<DeviceLocalAccountExternalDataManager>
external_data_manager =
external_data_service_->GetExternalDataManager(it->account_id,

Powered by Google App Engine
This is Rietveld 408576698