Minor cleanup of EnrollmentHandlerChromeOS.

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

Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index 72332bd14aef0d3527624b519e8bf4a049fae587..015c79ebf017f1172dbaca90f2a6f6433c750a73 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
@@ -121,11 +121,10 @@ void EnrollmentScreen::OnAuthError(const GoogleServiceAuthError& error) {
       LOG(WARNING) << "Network error " << error.state();
       return;
     case GoogleServiceAuthError::NUM_STATES:
-      break;
+      NOTREACHED();
+      return;
   }
-
   NOTREACHED();
-  UMAFailure(policy::kMetricEnrollmentOtherFailed);

[Joao da Silva, 2014/08/14 12:11:10]

Why was this sample removed? Even though it's not specific it's still better
than nothing; without it we won't learn that devices out there may be going
through the NOTREACHED flows.

[Thiemo Nagel, 2014/08/14 14:52:37]

It's after a switch on an enum.  The compiler will throw an error if a case has
been missed.  It will not be reached.  Anyways, I've refactored the switch to
use break instead of return.

 }
 
 void EnrollmentScreen::OnOAuthTokenAvailable(const std::string& token) {
@@ -301,9 +300,7 @@ void EnrollmentScreen::ReportEnrollmentStatus(policy::EnrollmentStatus status) {
       NOTREACHED();

[Joao da Silva, 2014/08/14 12:11:10]

Would be nice to have a sample here too, as this is a bug

[Thiemo Nagel, 2014/08/14 14:52:37]

This case is treated in line 221.  I've refactored the switch to make it less
confusing.

       return;
   }
-
   NOTREACHED();
-  UMAFailure(policy::kMetricEnrollmentOtherFailed);

[Joao da Silva, 2014/08/14 12:11:10]

Same here

[Thiemo Nagel, 2014/08/14 14:52:37]

Same as above.

 }
 
 void EnrollmentScreen::UMA(policy::MetricEnrollment sample) {