Revert of Minor cleanup of EnrollmentHandlerChromeOS.

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

Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
index aa9244ac9e7a7ac636acbd324ce9e1c3accbab7c..f786bbed4485d640af7b1f8599bf7b84014fd197 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
@@ -172,9 +172,12 @@
       ShowErrorScreen(ErrorScreen::ERROR_STATE_PROXY);
       return true;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT:
-      NOTREACHED() << "Bad status: CAPTIVE_PORTAL_STATUS_COUNT";
-      return false;
-  }
+      // Trigger NOTREACHED() below.
+      break;
+  }
+
+  NOTREACHED() << "Bad status " << new_captive_portal_status;
+  return false;
 }
 
 bool AutoEnrollmentCheckScreen::UpdateAutoEnrollmentState(
@@ -193,6 +196,9 @@
       ShowErrorScreen(ErrorScreen::ERROR_STATE_OFFLINE);
       return true;
   }
+
+  NOTREACHED() << "bad state " << new_auto_enrollment_state;
+  return false;
 }
 
 void AutoEnrollmentCheckScreen::ShowErrorScreen(