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

Side by Side Diff: chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

Issue 2302443002: Revert of All DCP manager tests that enroll/register are tested with all auths. (Closed)
Patch Set: Created 4 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_initializer.h" 5 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 cryptohome::AsyncMethodCaller* async_method_caller, 66 cryptohome::AsyncMethodCaller* async_method_caller,
67 std::unique_ptr<chromeos::attestation::AttestationFlow> attestation_flow) 67 std::unique_ptr<chromeos::attestation::AttestationFlow> attestation_flow)
68 : local_state_(local_state), 68 : local_state_(local_state),
69 enterprise_service_(enterprise_service), 69 enterprise_service_(enterprise_service),
70 background_task_runner_(background_task_runner), 70 background_task_runner_(background_task_runner),
71 install_attributes_(install_attributes), 71 install_attributes_(install_attributes),
72 state_keys_broker_(state_keys_broker), 72 state_keys_broker_(state_keys_broker),
73 device_store_(device_store), 73 device_store_(device_store),
74 manager_(manager), 74 manager_(manager),
75 attestation_flow_(std::move(attestation_flow)), 75 attestation_flow_(std::move(attestation_flow)),
76 signing_service_(base::MakeUnique<TpmEnrollmentKeySigningService>( 76 signing_service_(async_method_caller) {}
77 async_method_caller)) {}
78
79 void DeviceCloudPolicyInitializer::SetSigningServiceForTesting(
80 std::unique_ptr<policy::SigningService> signing_service) {
81 signing_service_ = std::move(signing_service);
82 }
83 77
84 DeviceCloudPolicyInitializer::~DeviceCloudPolicyInitializer() { 78 DeviceCloudPolicyInitializer::~DeviceCloudPolicyInitializer() {
85 DCHECK(!is_initialized_); 79 DCHECK(!is_initialized_);
86 } 80 }
87 81
88 void DeviceCloudPolicyInitializer::Init() { 82 void DeviceCloudPolicyInitializer::Init() {
89 DCHECK(!is_initialized_); 83 DCHECK(!is_initialized_);
90 84
91 is_initialized_ = true; 85 is_initialized_ = true;
92 device_store_->AddObserver(this); 86 device_store_->AddObserver(this);
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 if (!enrollment_callback.is_null()) 250 if (!enrollment_callback.is_null())
257 enrollment_callback.Run(status); 251 enrollment_callback.Run(status);
258 } 252 }
259 253
260 std::unique_ptr<CloudPolicyClient> DeviceCloudPolicyInitializer::CreateClient( 254 std::unique_ptr<CloudPolicyClient> DeviceCloudPolicyInitializer::CreateClient(
261 DeviceManagementService* device_management_service) { 255 DeviceManagementService* device_management_service) {
262 return base::MakeUnique<CloudPolicyClient>( 256 return base::MakeUnique<CloudPolicyClient>(
263 DeviceCloudPolicyManagerChromeOS::GetMachineID(), 257 DeviceCloudPolicyManagerChromeOS::GetMachineID(),
264 DeviceCloudPolicyManagerChromeOS::GetMachineModel(), 258 DeviceCloudPolicyManagerChromeOS::GetMachineModel(),
265 kPolicyVerificationKeyHash, device_management_service, 259 kPolicyVerificationKeyHash, device_management_service,
266 g_browser_process->system_request_context(), signing_service_.get()); 260 g_browser_process->system_request_context(), &signing_service_);
267 } 261 }
268 262
269 void DeviceCloudPolicyInitializer::TryToCreateClient() { 263 void DeviceCloudPolicyInitializer::TryToCreateClient() {
270 if (!device_store_->is_initialized() || 264 if (!device_store_->is_initialized() ||
271 !device_store_->has_policy() || 265 !device_store_->has_policy() ||
272 state_keys_broker_->pending() || 266 state_keys_broker_->pending() ||
273 enrollment_handler_) { 267 enrollment_handler_) {
274 return; 268 return;
275 } 269 }
276 StartConnection(CreateClient(enterprise_service_)); 270 StartConnection(CreateClient(enterprise_service_));
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 if (success && (success = att_signed_data.ParseFromString(signed_data))) { 311 if (success && (success = att_signed_data.ParseFromString(signed_data))) {
318 em_signed_data.set_data(att_signed_data.data()); 312 em_signed_data.set_data(att_signed_data.data());
319 em_signed_data.set_signature(att_signed_data.signature()); 313 em_signed_data.set_signature(att_signed_data.signature());
320 em_signed_data.set_extra_data_bytes(att_signed_data.data().size() - 314 em_signed_data.set_extra_data_bytes(att_signed_data.data().size() -
321 data.size()); 315 data.size());
322 } 316 }
323 callback.Run(success, em_signed_data); 317 callback.Run(success, em_signed_data);
324 } 318 }
325 319
326 } // namespace policy 320 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698