Revert of Minor cleanup of EnrollmentHandlerChromeOS.

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

 // 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.
 
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 154 matching lines @@
       return true;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_PORTAL);
       if (captive_portal_status_ != new_captive_portal_status)
         get_screen_observer()->GetErrorScreen()->FixCaptivePortal();
       return true;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
       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(
     policy::AutoEnrollmentState new_auto_enrollment_state) {
   switch (new_auto_enrollment_state) {
     case policy::AUTO_ENROLLMENT_STATE_IDLE:
       // The client should have been started already.
       NOTREACHED();
       return false;
     case policy::AUTO_ENROLLMENT_STATE_PENDING:
     case policy::AUTO_ENROLLMENT_STATE_SERVER_ERROR:
     case policy::AUTO_ENROLLMENT_STATE_TRIGGER_ENROLLMENT:
     case policy::AUTO_ENROLLMENT_STATE_NO_ENROLLMENT:
       return false;
     case policy::AUTO_ENROLLMENT_STATE_CONNECTION_ERROR:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_OFFLINE);
       return true;
   }
+
+  NOTREACHED() << "bad state " << new_auto_enrollment_state;
+  return false;
 }
 
 void AutoEnrollmentCheckScreen::ShowErrorScreen(
     ErrorScreen::ErrorState error_state) {
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   ErrorScreen* error_screen = get_screen_observer()->GetErrorScreen();
   error_screen->SetUIState(ErrorScreen::UI_STATE_AUTO_ENROLLMENT_ERROR);
   error_screen->AllowGuestSignin(true);
   error_screen->SetErrorState(error_state,
                               network ? network->name() : std::string());
   get_screen_observer()->ShowErrorScreen();
 }
 
 void AutoEnrollmentCheckScreen::SignalCompletion() {
   NetworkPortalDetector::Get()->RemoveObserver(this);
   auto_enrollment_progress_subscription_.reset();
   get_screen_observer()->OnExit(
       ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
 }
 
 }  // namespace chromeos