Improve GCM enum switch type safety

google_apis/gcm/engine/account_mapping.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/account_mapping.h"
 
 #include <stdint.h>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 19 matching lines @@
 std::string StatusToString(AccountMapping::MappingStatus status) {
   switch (status) {
     case AccountMapping::NEW:
       return kStatusNew;
     case AccountMapping::ADDING:
       return kStatusAdding;
     case AccountMapping::MAPPED:
       return kStatusMapped;
     case AccountMapping::REMOVING:
       return kStatusRemoving;
-    default:
-      NOTREACHED();
   }
+  NOTREACHED();
   return std::string();
 }
 
 bool StringToStatus(const std::string& status_str,
                     AccountMapping::MappingStatus* status) {
   if (status_str.compare(kStatusAdding) == 0)
     *status = AccountMapping::ADDING;
   else if (status_str.compare(kStatusMapped) == 0)
     *status = AccountMapping::MAPPED;
   else if (status_str.compare(kStatusRemoving) == 0)
@@ skipping 69 matching lines @@
 
   if (values.size() == kSizeWithMessage)
     last_message_id = values[kMessageIdIndex];
   else
     last_message_id.clear();
 
   return true;
 }
 
 }  // namespace gcm