Mixed Licenses Enrollment

chrome/browser/chromeos/policy/device_cloud_policy_initializer.h

Index: chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
index c976ed0219a2cbab6842a31df89b61246bf6d3e4..4cf138bebc4c323fd20733e08eeb47b14946b1d6 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
@@ -56,7 +56,11 @@ class EnrollmentStatus;
 // handles the enrollment process.
 class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
  public:
+  using EnrollmentLicenseMap = std::map<::policy::LicenseType, int>;

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

You have the same definition put into enterprise_enrollment_helper.h too (and
that one is not even belonging to any class).
Would it be possible to get rid of the duplication?

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

nit: #include <map>

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

nit: s/::policy//

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

Done.

+
   typedef base::Callback<void(EnrollmentStatus)> EnrollmentCallback;
+  typedef base::Callback<void(const EnrollmentLicenseMap&)>
+      LicenseSelectionCallback;

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

nit: Maybe "AvailableLicensesCallback"?

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

Done.

 
   // |background_task_runner| is used to execute long-running background tasks
   // that may involve file I/O.
@@ -77,16 +81,27 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
   virtual void Init();
   virtual void Shutdown();
 
-  // Starts enrollment or re-enrollment. Once the enrollment process completes,
-  // |enrollment_callback| is invoked and gets passed the status of the
-  // operation.
-  virtual void StartEnrollment(
+  // Prepares enrollment or re-enrollment. Enrollment should be started by
+  // either calling StartEnrollment or CheckAvailableLicenses /
+  // StartEnrollmentWithLicense. Once the enrollment process
+  // completes, |enrollment_callback| is invoked and gets passed the status of
+  // the operation.
+  virtual void PrepareEnrollment(
       DeviceManagementService* device_management_service,
       chromeos::ActiveDirectoryJoinDelegate* ad_join_delegate,
       const EnrollmentConfig& enrollment_config,
       const std::string& auth_token,
       const EnrollmentCallback& enrollment_callback);
 
+  // Starts enrollment using server-based license type selection.
+  virtual void StartEnrollment();
+
+  // Queries server about available license types and their count.
+  virtual void CheckAvailableLicenses(const LicenseSelectionCallback& callback);
+
+  // Starts enrollment using user-selected license type.
+  virtual void StartEnrollmentWithLicense(policy::LicenseType license_type);
+
   // Get the enrollment configuration that has been set up via signals such as
   // device requisition, OEM manifest, pre-existing installation-time attributes
   // or server-backed state retrieval. The configuration is stored in |config|,