Refactor: Inject StatisticsProvider as a dependency of DeviceCloudPolicyInitializer.

chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc

Index: chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
index 574177b306114d7fc978a5ac82b71cf0261ba9ea..8f87b4b3849ff436d604c8ef66e5cd2c59585bbe 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -118,6 +118,20 @@ EnrollmentHandlerChromeOS::~EnrollmentHandlerChromeOS() {
 void EnrollmentHandlerChromeOS::StartEnrollment() {
   CHECK_EQ(STEP_PENDING, enrollment_step_);
   enrollment_step_ = STEP_STATE_KEYS;
+
+  if (client_->machine_id().empty()) {
+    LOG(ERROR) << "Machine id empty.";
+    ReportResult(EnrollmentStatus::ForStatus(
+        EnrollmentStatus::STATUS_NO_MACHINE_IDENTIFICATION));
+    return;
+  }
+  if (client_->machine_model().empty()) {
+    LOG(ERROR) << "Machine model empty.";
+    ReportResult(EnrollmentStatus::ForStatus(
+        EnrollmentStatus::STATUS_NO_MACHINE_IDENTIFICATION));
+    return;
+  }

[Mattias Nissler (ping if slow), 2016/09/29 09:12:26]

Since device policy is the only case where machine id and machine model are
supposed to be configured, it seems a bit backwards to use CloudPolicyClient as
the vehicle to carry them around now.

Maybe a cleaner approach would be to just remove them from the constructor of
CloudPolicyClient and pass them to CloudPolicyClient::Register() as parameters?
I think that would clear up the data flow. While you're doing this, you probably
also want to get rid of the submit_machine_id_ thing (this was put in to recover
devices in the field from an earlier bug, but is no longer needed AFAIK).

+
   state_keys_broker_->RequestStateKeys(
       base::Bind(&EnrollmentHandlerChromeOS::HandleStateKeysResult,
                  weak_ptr_factory_.GetWeakPtr()));