Avoid segfault for missing StateKeysBroker

chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
index 1a6f976f51e85e99b5fd1a6aa46e96c542faad80..59553df7bce9ec2085fe1cc3711a1aa8fdc1d3b2 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
@@ -217,26 +217,30 @@ AutoEnrollmentController::RegisterProgressCallback(
 
 void AutoEnrollmentController::OnOwnershipStatusCheckDone(
     DeviceSettingsService::OwnershipStatus status) {
-  switch (status) {
-    case DeviceSettingsService::OWNERSHIP_NONE: {
+  policy::ServerBackedStateKeysBroker* state_keys_broker =

[bartfab (slow), 2017/03/22 13:17:07]

Nit: const

[Thiemo Nagel, 2017/03/22 13:23:00]

ServerBackedStateKeysBroker::RequestStateKeys() is not const.

       g_browser_process->platform_part()
           ->browser_policy_connector_chromeos()
-          ->GetStateKeysBroker()
-          ->RequestStateKeys(
-              base::Bind(&AutoEnrollmentController::StartClient,
-                         client_start_weak_factory_.GetWeakPtr()));
-      break;
-    }
-    case DeviceSettingsService::OWNERSHIP_TAKEN: {
+          ->GetStateKeysBroker();
+  switch (status) {
+    case DeviceSettingsService::OWNERSHIP_NONE:
+      // TODO(tnagel): Prevent missing state keys broker in the first place.

[bartfab (slow), 2017/03/22 13:17:07]

Nit: Can you reference a bug number?

[Thiemo Nagel, 2017/03/22 13:23:00]

Done.

+      if (!state_keys_broker) {
+        LOG(ERROR) << "State keys broker missing.";
+        UpdateState(policy::AUTO_ENROLLMENT_STATE_NO_ENROLLMENT);
+        return;
+      }
+      state_keys_broker->RequestStateKeys(
+          base::Bind(&AutoEnrollmentController::StartClient,
+                     client_start_weak_factory_.GetWeakPtr()));
+      return;
+    case DeviceSettingsService::OWNERSHIP_TAKEN:
       VLOG(1) << "Device already owned, skipping auto-enrollment check.";
       UpdateState(policy::AUTO_ENROLLMENT_STATE_NO_ENROLLMENT);
-      break;
-    }
-    case DeviceSettingsService::OWNERSHIP_UNKNOWN: {
+      return;
+    case DeviceSettingsService::OWNERSHIP_UNKNOWN:
       LOG(ERROR) << "Ownership unknown, skipping auto-enrollment check.";
       UpdateState(policy::AUTO_ENROLLMENT_STATE_NO_ENROLLMENT);
-      break;
-    }
+      return;
   }
 }