Mixed Licenses Enrollment

chrome/browser/chromeos/policy/device_cloud_policy_initializer.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_INITIALIZER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_INITIALIZER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 38 matching lines @@
 class DeviceCloudPolicyStoreChromeOS;
 class DeviceManagementService;
 struct EnrollmentConfig;
 class EnrollmentHandlerChromeOS;
 class EnrollmentStatus;
 
 // This class connects DCPM to the correct device management service, and
 // 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.
   DeviceCloudPolicyInitializer(
       PrefService* local_state,
       DeviceManagementService* enterprise_service,
       const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
       chromeos::InstallAttributes* install_attributes,
       ServerBackedStateKeysBroker* state_keys_broker,
       DeviceCloudPolicyStoreChromeOS* device_store,
       DeviceCloudPolicyManagerChromeOS* manager,
       cryptohome::AsyncMethodCaller* async_method_caller,
       std::unique_ptr<chromeos::attestation::AttestationFlow> attestation_flow,
       chromeos::system::StatisticsProvider* statistics_provider);
 
   ~DeviceCloudPolicyInitializer() override;
 
   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|,
   // |config.mode| will be MODE_NONE if there is no prescribed configuration.
   // |config.management_domain| will contain the domain the device is supposed
   // to be enrolled to as decided by factors such as forced re-enrollment,
   // enrollment recovery, or already-present install attributes. Note that
   // |config.management_domain| may be non-empty even if |config.mode| is
   // MODE_NONE.
   EnrollmentConfig GetPrescribedEnrollmentConfig() const;
@@ skipping 63 matching lines @@
 
   // Our signing service.
   std::unique_ptr<SigningService> signing_service_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyInitializer);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_INITIALIZER_H_