Improve GCM enum switch type safety

components/gcm_driver/gcm_stats_recorder_impl.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 "components/gcm_driver/gcm_stats_recorder_impl.h"
 
 #include <deque>
 #include <vector>
 
 #include "base/format_macros.h"
@@ skipping 32 matching lines @@
     case gcm::MCSClient::QUEUE_SIZE_LIMIT_REACHED:
       return "QUEUE_SIZE_LIMIT_REACHED";
     case gcm::MCSClient::APP_QUEUE_SIZE_LIMIT_REACHED:
       return "APP_QUEUE_SIZE_LIMIT_REACHED";
     case gcm::MCSClient::MESSAGE_TOO_LARGE:
       return "MESSAGE_TOO_LARGE";
     case gcm::MCSClient::NO_CONNECTION_ON_ZERO_TTL:
       return "NO_CONNECTION_ON_ZERO_TTL";
     case gcm::MCSClient::TTL_EXCEEDED:
       return "TTL_EXCEEDED";
-    default:
+    case gcm::MCSClient::SEND_STATUS_COUNT:
       NOTREACHED();
-      return "UNKNOWN";
+      break;
   }
+  return "UNKNOWN";
 }
 
 // Helper for getting string representation of the
 // ConnectionFactory::ConnectionResetReason enum.
 std::string GetConnectionResetReasonString(
     gcm::ConnectionFactory::ConnectionResetReason reason) {
   switch (reason) {
     case gcm::ConnectionFactory::LOGIN_FAILURE:
       return "LOGIN_FAILURE";
     case gcm::ConnectionFactory::CLOSE_COMMAND:
       return "CLOSE_COMMAND";
     case gcm::ConnectionFactory::HEARTBEAT_FAILURE:
       return "HEARTBEAT_FAILURE";
     case gcm::ConnectionFactory::SOCKET_FAILURE:
       return "SOCKET_FAILURE";
     case gcm::ConnectionFactory::NETWORK_CHANGE:
       return "NETWORK_CHANGE";
-    default:
+    case gcm::ConnectionFactory::NEW_HEARTBEAT_INTERVAL:
+      return "NEW_HEARTBEAT_INTERVAL";
+    case gcm::ConnectionFactory::CONNECTION_RESET_COUNT:
       NOTREACHED();
-      return "UNKNOWN_REASON";
+      break;
   }
+  return "UNKNOWN_REASON";
 }
 
 // Helper for getting string representation of the RegistrationRequest::Status
 // enum.
 std::string GetRegistrationStatusString(
     gcm::RegistrationRequest::Status status) {
   switch (status) {
     case gcm::RegistrationRequest::SUCCESS:
       return "SUCCESS";
     case gcm::RegistrationRequest::INVALID_PARAMETERS:
       return "INVALID_PARAMETERS";
     case gcm::RegistrationRequest::INVALID_SENDER:
       return "INVALID_SENDER";
     case gcm::RegistrationRequest::AUTHENTICATION_FAILED:
       return "AUTHENTICATION_FAILED";
     case gcm::RegistrationRequest::DEVICE_REGISTRATION_ERROR:
       return "DEVICE_REGISTRATION_ERROR";
     case gcm::RegistrationRequest::UNKNOWN_ERROR:
       return "UNKNOWN_ERROR";
     case gcm::RegistrationRequest::URL_FETCHING_FAILED:
       return "URL_FETCHING_FAILED";
     case gcm::RegistrationRequest::HTTP_NOT_OK:
       return "HTTP_NOT_OK";
     case gcm::RegistrationRequest::RESPONSE_PARSING_FAILED:
       return "RESPONSE_PARSING_FAILED";
     case gcm::RegistrationRequest::REACHED_MAX_RETRIES:
       return "REACHED_MAX_RETRIES";
-    default:
+    case gcm::RegistrationRequest::STATUS_COUNT:
       NOTREACHED();
-      return "UNKNOWN_STATUS";
+      break;
   }
+  return "UNKNOWN_STATUS";
 }
 
 // Helper for getting string representation of the RegistrationRequest::Status
 // enum.
 std::string GetUnregistrationStatusString(
     gcm::UnregistrationRequest::Status status) {
   switch (status) {
     case gcm::UnregistrationRequest::SUCCESS:
       return "SUCCESS";
     case gcm::UnregistrationRequest::URL_FETCHING_FAILED:
       return "URL_FETCHING_FAILED";
     case gcm::UnregistrationRequest::NO_RESPONSE_BODY:
       return "NO_RESPONSE_BODY";
     case gcm::UnregistrationRequest::RESPONSE_PARSING_FAILED:
       return "RESPONSE_PARSING_FAILED";
     case gcm::UnregistrationRequest::INCORRECT_APP_ID:
       return "INCORRECT_APP_ID";
     case gcm::UnregistrationRequest::INVALID_PARAMETERS:
       return "INVALID_PARAMETERS";
     case gcm::UnregistrationRequest::SERVICE_UNAVAILABLE:
       return "SERVICE_UNAVAILABLE";
     case gcm::UnregistrationRequest::INTERNAL_SERVER_ERROR:
       return "INTERNAL_SERVER_ERROR";
     case gcm::UnregistrationRequest::HTTP_NOT_OK:
       return "HTTP_NOT_OK";
     case gcm::UnregistrationRequest::UNKNOWN_ERROR:
       return "UNKNOWN_ERROR";
     case gcm::UnregistrationRequest::REACHED_MAX_RETRIES:
       return "REACHED_MAX_RETRIES";
-    default:
+    case gcm::UnregistrationRequest::UNREGISTRATION_STATUS_COUNT:
       NOTREACHED();
-      return "UNKNOWN_STATUS";
+      break;
   }
+  return "UNKNOWN_STATUS";
 }
 
 }  // namespace
 
 GCMStatsRecorderImpl::GCMStatsRecorderImpl()
     : is_recording_(false),
       delegate_(NULL),
       data_message_received_since_connected_(false),
       received_data_message_burst_size_(0) {
 }
@@ skipping 285 matching lines @@
 
   if (!is_recording_)
     return;
   if (!to_registered_app) {
     RecordReceiving(app_id,
                     from,
                     message_byte_size,
                     "Data msg received",
                     "No such registered app found");
   } else {
-    switch(message_type) {
+    switch (message_type) {
       case GCMStatsRecorderImpl::DATA_MESSAGE:
         RecordReceiving(app_id, from, message_byte_size, "Data msg received",
                         std::string());
         break;
       case GCMStatsRecorderImpl::DELETED_MESSAGES:
         RecordReceiving(app_id, from, message_byte_size, "Data msg received",
                         "Message has been deleted on server");
         break;
-      default:
-        NOTREACHED();
     }
   }
 }
 
 void GCMStatsRecorderImpl::CollectActivities(
     RecordedActivities* recorded_activities) const {
   recorded_activities->checkin_activities.insert(
       recorded_activities->checkin_activities.begin(),
       checkin_activities_.begin(),
       checkin_activities_.end());
@@ skipping 71 matching lines @@
     const std::string& receiver_id,
     const std::string& message_id) {
   UMA_HISTOGRAM_COUNTS("GCM.IncomingSendErrors", 1);
   if (!is_recording_)
     return;
   RecordSending(app_id, receiver_id, message_id, "Received 'send error' msg",
                 std::string());
 }
 
 }  // namespace gcm