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

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

Issue 2287343004: All DCP manager tests that enroll/register are tested with all auths. (Closed)
Patch Set: Slight renaming. Created 4 years, 4 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/device_cloud_policy_initializer.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index 1d154ff9728a7c2bf16ad52313da0eb0a110405c..7e6b42aa2f144a13388dd422e034739880506139 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -72,8 +72,16 @@ DeviceCloudPolicyInitializer::DeviceCloudPolicyInitializer(
state_keys_broker_(state_keys_broker),
device_store_(device_store),
manager_(manager),
- attestation_flow_(std::move(attestation_flow)),
- signing_service_(async_method_caller) {}
+ attestation_flow_(std::move(attestation_flow)) {
+ default_signing_service_.reset(
+ new TpmEnrollmentKeySigningService(async_method_caller));
+ signing_service_ = default_signing_service_.get();
+}
+
+void DeviceCloudPolicyInitializer::SetSigningServiceForTesting(
+ policy::SigningService* signing_service) {
+ signing_service_ = signing_service;
+}
DeviceCloudPolicyInitializer::~DeviceCloudPolicyInitializer() {
DCHECK(!is_initialized_);
@@ -257,7 +265,7 @@ std::unique_ptr<CloudPolicyClient> DeviceCloudPolicyInitializer::CreateClient(
DeviceCloudPolicyManagerChromeOS::GetMachineID(),
DeviceCloudPolicyManagerChromeOS::GetMachineModel(),
kPolicyVerificationKeyHash, device_management_service,
- g_browser_process->system_request_context(), &signing_service_);
+ g_browser_process->system_request_context(), signing_service_);
}
void DeviceCloudPolicyInitializer::TryToCreateClient() {

Powered by Google App Engine
This is Rietveld 408576698