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

Side by Side Diff: chrome/browser/chromeos/policy/device_cloud_policy_store_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, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 5 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
10 #include "base/sequenced_task_runner.h" 12 #include "base/sequenced_task_runner.h"
11 #include "chrome/browser/chromeos/login/startup_utils.h" 13 #include "chrome/browser/chromeos/login/startup_utils.h"
12 #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h" 14 #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h"
13 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 15 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
14 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 16 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
15 #include "components/ownership/owner_key_util.h" 17 #include "components/ownership/owner_key_util.h"
16 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 18 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 DeviceCloudPolicyStoreChromeOS::CreateValidator( 107 DeviceCloudPolicyStoreChromeOS::CreateValidator(
106 const em::PolicyFetchResponse& policy) { 108 const em::PolicyFetchResponse& policy) {
107 scoped_ptr<DeviceCloudPolicyValidator> validator( 109 scoped_ptr<DeviceCloudPolicyValidator> validator(
108 DeviceCloudPolicyValidator::Create( 110 DeviceCloudPolicyValidator::Create(
109 scoped_ptr<em::PolicyFetchResponse>( 111 scoped_ptr<em::PolicyFetchResponse>(
110 new em::PolicyFetchResponse(policy)), 112 new em::PolicyFetchResponse(policy)),
111 background_task_runner_)); 113 background_task_runner_));
112 validator->ValidateDomain(install_attributes_->GetDomain()); 114 validator->ValidateDomain(install_attributes_->GetDomain());
113 validator->ValidatePolicyType(dm_protocol::kChromeDevicePolicyType); 115 validator->ValidatePolicyType(dm_protocol::kChromeDevicePolicyType);
114 validator->ValidatePayload(); 116 validator->ValidatePayload();
115 return validator.Pass(); 117 return validator;
116 } 118 }
117 119
118 void DeviceCloudPolicyStoreChromeOS::OnPolicyToStoreValidated( 120 void DeviceCloudPolicyStoreChromeOS::OnPolicyToStoreValidated(
119 DeviceCloudPolicyValidator* validator) { 121 DeviceCloudPolicyValidator* validator) {
120 if (!validator->success()) { 122 if (!validator->success()) {
121 status_ = STATUS_VALIDATION_ERROR; 123 status_ = STATUS_VALIDATION_ERROR;
122 validation_status_ = validator->status(); 124 validation_status_ = validator->status();
123 NotifyStoreError(); 125 NotifyStoreError();
124 return; 126 return;
125 } 127 }
126 128
127 device_settings_service_->Store( 129 device_settings_service_->Store(
128 validator->policy().Pass(), 130 std::move(validator->policy()),
129 base::Bind(&DeviceCloudPolicyStoreChromeOS::OnPolicyStored, 131 base::Bind(&DeviceCloudPolicyStoreChromeOS::OnPolicyStored,
130 weak_factory_.GetWeakPtr())); 132 weak_factory_.GetWeakPtr()));
131 } 133 }
132 134
133 void DeviceCloudPolicyStoreChromeOS::OnPolicyStored() { 135 void DeviceCloudPolicyStoreChromeOS::OnPolicyStored() {
134 UpdateFromService(); 136 UpdateFromService();
135 } 137 }
136 138
137 void DeviceCloudPolicyStoreChromeOS::UpdateFromService() { 139 void DeviceCloudPolicyStoreChromeOS::UpdateFromService() {
138 const em::PolicyData* policy_data = device_settings_service_->policy_data(); 140 const em::PolicyData* policy_data = device_settings_service_->policy_data();
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 case chromeos::DeviceSettingsService::STORE_VALIDATION_ERROR: 230 case chromeos::DeviceSettingsService::STORE_VALIDATION_ERROR:
229 case chromeos::DeviceSettingsService::STORE_TEMP_VALIDATION_ERROR: 231 case chromeos::DeviceSettingsService::STORE_TEMP_VALIDATION_ERROR:
230 status_ = STATUS_LOAD_ERROR; 232 status_ = STATUS_LOAD_ERROR;
231 break; 233 break;
232 } 234 }
233 235
234 NotifyStoreError(); 236 NotifyStoreError();
235 } 237 }
236 238
237 } // namespace policy 239 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698