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

Unified Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Issue 1557693002: Convert Pass()→std::move() in //chrome/browser/chromeos/policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 8ed5b15117cc0615ad93fb295240b7313716b262..ff1db857edee3bbe1e5a09c95918b290defb9457 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include <string>
+#include <utility>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
@@ -139,8 +141,8 @@ BrowserPolicyConnectorChromeOS::BrowserPolicyConnectorChromeOS()
install_attributes_.get(),
GetBackgroundTaskRunner()));
device_cloud_policy_manager_ = new DeviceCloudPolicyManagerChromeOS(
- device_cloud_policy_store.Pass(), base::ThreadTaskRunnerHandle::Get(),
- state_keys_broker_.get());
+ std::move(device_cloud_policy_store),
+ base::ThreadTaskRunnerHandle::Get(), state_keys_broker_.get());
AddPolicyProvider(
scoped_ptr<ConfigurationPolicyProvider>(device_cloud_policy_manager_));
}
@@ -168,7 +170,7 @@ void BrowserPolicyConnectorChromeOS::Init(
new DeviceManagementServiceConfiguration(
GetDeviceManagementServerUrlForConsumer()));
consumer_device_management_service_.reset(
- new DeviceManagementService(configuration.Pass()));
+ new DeviceManagementService(std::move(configuration)));
consumer_device_management_service_->ScheduleInitialization(
kServiceInitializationStartupDelay);
}
@@ -291,12 +293,12 @@ void BrowserPolicyConnectorChromeOS::SetUserPolicyDelegate(
void BrowserPolicyConnectorChromeOS::SetConsumerManagementServiceForTesting(
scoped_ptr<ConsumerManagementService> service) {
- consumer_management_service_ = service.Pass();
+ consumer_management_service_ = std::move(service);
}
void BrowserPolicyConnectorChromeOS::SetDeviceCloudPolicyInitializerForTesting(
scoped_ptr<DeviceCloudPolicyInitializer> initializer) {
- device_cloud_policy_initializer_ = initializer.Pass();
+ device_cloud_policy_initializer_ = std::move(initializer);
}
// static

Powered by Google App Engine
This is Rietveld 408576698