Mixed Licenses Enrollment

chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 78 matching lines @@
 
 void DeviceCloudPolicyInitializer::Shutdown() {
   DCHECK(is_initialized_);
 
   device_store_->RemoveObserver(this);
   enrollment_handler_.reset();
   state_keys_update_subscription_.reset();
   is_initialized_ = false;
 }
 
-void DeviceCloudPolicyInitializer::StartEnrollment(
+void DeviceCloudPolicyInitializer::PrepareEnrollment(
     DeviceManagementService* device_management_service,
     chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
     const EnrollmentConfig& enrollment_config,
     const std::string& auth_token,
     const EnrollmentCallback& enrollment_callback) {
   DCHECK(is_initialized_);
   DCHECK(!enrollment_handler_);
 
   manager_->core()->Disconnect();
 
   enrollment_handler_.reset(new EnrollmentHandlerChromeOS(
       device_store_, install_attributes_, state_keys_broker_,
       attestation_flow_.get(), CreateClient(device_management_service),
       background_task_runner_, ad_join_delegate, enrollment_config, auth_token,
       install_attributes_->GetDeviceId(), manager_->GetDeviceRequisition(),
       base::Bind(&DeviceCloudPolicyInitializer::EnrollmentCompleted,
                  base::Unretained(this), enrollment_callback)));
+}
+
+void DeviceCloudPolicyInitializer::StartEnrollment() {
+  DCHECK(is_initialized_);
+  DCHECK(enrollment_handler_);
   enrollment_handler_->StartEnrollment();
 }
 
+void DeviceCloudPolicyInitializer::CheckAvailableLicenses(

[emaxx, 2017/07/21 12:57:29]

This method effectively does nothing now - so is it a TODO or NOTIMPLEMENTED? Or
the uploaded patchset is broken again?

[Denis Kuznetsov (DE-MUC), 2017/07/25 21:51:06]

Done.

+    const LicenseSelectionCallback& callback) {
+  DCHECK(is_initialized_);
+  DCHECK(enrollment_handler_);
+}
+
+void DeviceCloudPolicyInitializer::StartEnrollmentWithLicense(
+    policy::LicenseType license_type) {
+  DCHECK(is_initialized_);
+  DCHECK(enrollment_handler_);
+  DCHECK(license_type != policy::LicenseType::UNKNOWN);
+  enrollment_handler_->StartEnrollment();

[emaxx, 2017/07/21 12:57:30]

The license type, received as a parameter, is just dropped in this function. So,
again - should this be TODO or something is wrong with the CL now?

[Denis Kuznetsov (DE-MUC), 2017/07/25 21:51:06]

Done.

+}
+
 EnrollmentConfig DeviceCloudPolicyInitializer::GetPrescribedEnrollmentConfig()
     const {
   EnrollmentConfig config;
 
   // Authentication through the attestation mechanism is controlled by a
   // command line switch that either enables it or forces it (meaning that
   // interactive authentication is disabled).
   switch (DeviceCloudPolicyManagerChromeOS::GetZeroTouchEnrollmentMode()) {
     case ZeroTouchEnrollmentMode::DISABLED:
       // Only use interactive authentication.
@@ skipping 202 matching lines @@
   if (success && (success = att_signed_data.ParseFromString(signed_data))) {
     em_signed_data.set_data(att_signed_data.data());
     em_signed_data.set_signature(att_signed_data.signature());
     em_signed_data.set_extra_data_bytes(att_signed_data.data().size() -
                                         data.size());
   }
   callback.Run(success, em_signed_data);
 }
 
 }  // namespace policy