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

Unified Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.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/browser_policy_connector_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index a5d5bd05e4eecc9d6a0bdea009003cd875ebc7bb..9af906273ae2058ded60838859073d8263433b5b 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -135,20 +135,19 @@ BrowserPolicyConnectorChromeOS::BrowserPolicyConnectorChromeOS()
chromeos::DeviceSettingsService::Get()));
}
- scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store(
+ std::unique_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store(
new DeviceCloudPolicyStoreChromeOS(
- chromeos::DeviceSettingsService::Get(),
- install_attributes_.get(),
+ chromeos::DeviceSettingsService::Get(), install_attributes_.get(),
GetBackgroundTaskRunner()));
device_cloud_policy_manager_ = new DeviceCloudPolicyManagerChromeOS(
std::move(device_cloud_policy_store),
base::ThreadTaskRunnerHandle::Get(), state_keys_broker_.get());
- AddPolicyProvider(
- scoped_ptr<ConfigurationPolicyProvider>(device_cloud_policy_manager_));
+ AddPolicyProvider(std::unique_ptr<ConfigurationPolicyProvider>(
+ device_cloud_policy_manager_));
}
global_user_cloud_policy_provider_ = new ProxyPolicyProvider();
- AddPolicyProvider(scoped_ptr<ConfigurationPolicyProvider>(
+ AddPolicyProvider(std::unique_ptr<ConfigurationPolicyProvider>(
global_user_cloud_policy_provider_));
}
@@ -166,7 +165,7 @@ void BrowserPolicyConnectorChromeOS::Init(
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(chromeos::switches::kEnableConsumerManagement)) {
- scoped_ptr<DeviceManagementService::Configuration> configuration(
+ std::unique_ptr<DeviceManagementService::Configuration> configuration(
new DeviceManagementServiceConfiguration(
GetDeviceManagementServerUrlForConsumer()));
consumer_device_management_service_.reset(
@@ -292,12 +291,12 @@ void BrowserPolicyConnectorChromeOS::SetUserPolicyDelegate(
}
void BrowserPolicyConnectorChromeOS::SetConsumerManagementServiceForTesting(
- scoped_ptr<ConsumerManagementService> service) {
+ std::unique_ptr<ConsumerManagementService> service) {
consumer_management_service_ = std::move(service);
}
void BrowserPolicyConnectorChromeOS::SetDeviceCloudPolicyInitializerForTesting(
- scoped_ptr<DeviceCloudPolicyInitializer> initializer) {
+ std::unique_ptr<DeviceCloudPolicyInitializer> initializer) {
device_cloud_policy_initializer_ = std::move(initializer);
}

Powered by Google App Engine
This is Rietveld 408576698