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

Unified Diff: chrome/browser/chromeos/policy/enrollment_handler_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 4 years, 12 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/enrollment_handler_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
index bf8e1f13752327a39bb407b4736ad35c5e923f39..a92cd51a0274bd75c69c199d8ff00cf3016486e9 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/policy/enrollment_handler_chromeos.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
@@ -77,7 +79,7 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
install_attributes_(install_attributes),
state_keys_broker_(state_keys_broker),
owner_settings_service_(owner_settings_service),
- client_(client.Pass()),
+ client_(std::move(client)),
background_task_runner_(background_task_runner),
enrollment_config_(enrollment_config),
auth_token_(auth_token),
@@ -116,7 +118,7 @@ void EnrollmentHandlerChromeOS::StartEnrollment() {
scoped_ptr<CloudPolicyClient> EnrollmentHandlerChromeOS::ReleaseClient() {
Stop();
- return client_.Pass();
+ return std::move(client_);
}
void EnrollmentHandlerChromeOS::OnPolicyFetched(CloudPolicyClient* client) {
@@ -277,7 +279,7 @@ void EnrollmentHandlerChromeOS::HandlePolicyValidationResult(
DeviceCloudPolicyValidator* validator) {
CHECK_EQ(STEP_VALIDATION, enrollment_step_);
if (validator->success()) {
- policy_ = validator->policy().Pass();
+ policy_ = std::move(validator->policy());
username_ = validator->policy_data()->username();
device_id_ = validator->policy_data()->device_id();
request_token_ = validator->policy_data()->request_token();

Powered by Google App Engine
This is Rietveld 408576698