Improve GCM enum switch type safety

google_apis/gcm/engine/registration_request.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 "google_apis/gcm/engine/registration_request.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
     return RegistrationRequest::DEVICE_REGISTRATION_ERROR;
   if (error.find(kAuthenticationFailed) != std::string::npos)
     return RegistrationRequest::AUTHENTICATION_FAILED;
   if (error.find(kInvalidSender) != std::string::npos)
     return RegistrationRequest::INVALID_SENDER;
   if (error.find(kInvalidParameters) != std::string::npos)
     return RegistrationRequest::INVALID_PARAMETERS;
   return RegistrationRequest::UNKNOWN_ERROR;
 }
 
-// Indicates whether a retry attempt should be made based on the status of the
-// last request.
+// Determines whether to retry based on the status of the last request.
 bool ShouldRetryWithStatus(RegistrationRequest::Status status) {
-  return status == RegistrationRequest::UNKNOWN_ERROR ||
-         status == RegistrationRequest::AUTHENTICATION_FAILED ||
-         status == RegistrationRequest::DEVICE_REGISTRATION_ERROR ||
-         status == RegistrationRequest::HTTP_NOT_OK ||
-         status == RegistrationRequest::URL_FETCHING_FAILED ||
-         status == RegistrationRequest::RESPONSE_PARSING_FAILED;
+  switch (status) {
+    case RegistrationRequest::AUTHENTICATION_FAILED:
+    case RegistrationRequest::DEVICE_REGISTRATION_ERROR:
+    case RegistrationRequest::UNKNOWN_ERROR:
+    case RegistrationRequest::URL_FETCHING_FAILED:
+    case RegistrationRequest::HTTP_NOT_OK:
+    case RegistrationRequest::RESPONSE_PARSING_FAILED:
+      return true;
+    case RegistrationRequest::SUCCESS:
+    case RegistrationRequest::INVALID_PARAMETERS:
+    case RegistrationRequest::INVALID_SENDER:
+    case RegistrationRequest::REACHED_MAX_RETRIES:
+      return false;
+    case RegistrationRequest::STATUS_COUNT:
+      NOTREACHED();
+      break;
+  }
+  return false;
 }
 
 }  // namespace
 
 RegistrationRequest::RequestInfo::RequestInfo(uint64_t android_id,
                                               uint64_t security_token,
                                               const std::string& category,
                                               const std::string& subtype)
     : android_id(android_id),
       security_token(security_token),
@@ skipping 168 matching lines @@
     // Only REACHED_MAX_RETRIES is reported because the function will skip
     // reporting count and time when status is not SUCCESS.
     DCHECK(custom_request_handler_.get());
     custom_request_handler_->ReportUMAs(status, 0, base::TimeDelta());
   }
 
   callback_.Run(status, token);
 }
 
 }  // namespace gcm