Mixed Licenses Enrollment

chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

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 b769bc0b935e9e7af8c55b4ac963c974e0b3ebda..8e46f65d485065d843497ba0f96305c8e64e7eab 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -96,7 +96,7 @@ void DeviceCloudPolicyInitializer::Shutdown() {
   is_initialized_ = false;
 }
 
-void DeviceCloudPolicyInitializer::StartEnrollment(
+void DeviceCloudPolicyInitializer::PrepareEnrollment(
     DeviceManagementService* device_management_service,
     chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
     const EnrollmentConfig& enrollment_config,
@@ -114,6 +114,25 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
       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.

 }