1 files changed, 2 insertions, 27 deletions

diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc
index 5c626e4..006b493 100644
--- a/sync/syncable/model_type.cc
+++ b/sync/syncable/model_type.cc
@@ -135,59 +135,41 @@ ModelType GetModelTypeFromSpecificsFieldNumber(int field_number) {
 }
 
 int GetSpecificsFieldNumberFromModelType(ModelType model_type) {
-  if (!ProtocolTypes().Has(model_type)) {
-    NOTREACHED() << "Only protocol types have field values.";
-    return 0;
-  }
+  DCHECK(ProtocolTypes().Has(model_type))
+      << "Only protocol types have field values.";
   switch (model_type) {
     case BOOKMARKS:
       return sync_pb::EntitySpecifics::kBookmarkFieldNumber;
-      break;
     case PASSWORDS:
       return sync_pb::EntitySpecifics::kPasswordFieldNumber;
-      break;
     case PREFERENCES:
       return sync_pb::EntitySpecifics::kPreferenceFieldNumber;
-      break;
     case AUTOFILL:
       return sync_pb::EntitySpecifics::kAutofillFieldNumber;
-      break;
     case AUTOFILL_PROFILE:
       return sync_pb::EntitySpecifics::kAutofillProfileFieldNumber;
-      break;
     case THEMES:
       return sync_pb::EntitySpecifics::kThemeFieldNumber;
-      break;
     case TYPED_URLS:
       return sync_pb::EntitySpecifics::kTypedUrlFieldNumber;
-      break;
     case EXTENSIONS:
       return sync_pb::EntitySpecifics::kExtensionFieldNumber;
-      break;
     case NIGORI:
       return sync_pb::EntitySpecifics::kNigoriFieldNumber;
-      break;
     case SEARCH_ENGINES:
       return sync_pb::EntitySpecifics::kSearchEngineFieldNumber;
-      break;
     case SESSIONS:
       return sync_pb::EntitySpecifics::kSessionFieldNumber;
-      break;
     case APPS:
       return sync_pb::EntitySpecifics::kAppFieldNumber;
-      break;
     case APP_LIST:
       return sync_pb::EntitySpecifics::kAppListFieldNumber;
-      break;
     case APP_SETTINGS:
       return sync_pb::EntitySpecifics::kAppSettingFieldNumber;
-      break;
     case EXTENSION_SETTINGS:
       return sync_pb::EntitySpecifics::kExtensionSettingFieldNumber;
-      break;
     case APP_NOTIFICATIONS:
       return sync_pb::EntitySpecifics::kAppNotificationFieldNumber;
-      break;
     case HISTORY_DELETE_DIRECTIVES:
       return sync_pb::EntitySpecifics::kHistoryDeleteDirectiveFieldNumber;
     case SYNCED_NOTIFICATIONS:
@@ -196,16 +178,12 @@ int GetSpecificsFieldNumberFromModelType(ModelType model_type) {
       return sync_pb::EntitySpecifics::kSyncedNotificationAppInfoFieldNumber;
     case DEVICE_INFO:
       return sync_pb::EntitySpecifics::kDeviceInfoFieldNumber;
-      break;
     case EXPERIMENTS:
       return sync_pb::EntitySpecifics::kExperimentsFieldNumber;
-      break;
     case PRIORITY_PREFERENCES:
       return sync_pb::EntitySpecifics::kPriorityPreferenceFieldNumber;
-      break;
     case DICTIONARY:
       return sync_pb::EntitySpecifics::kDictionaryFieldNumber;
-      break;
     case FAVICON_IMAGES:
       return sync_pb::EntitySpecifics::kFaviconImageFieldNumber;
     case FAVICON_TRACKING:
@@ -222,9 +200,6 @@ int GetSpecificsFieldNumberFromModelType(ModelType model_type) {
       NOTREACHED() << "No known extension for model type.";
       return 0;
   }
-  NOTREACHED() << "Needed for linux_keep_shadow_stacks because of "
-               << "http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20681";
-  return 0;
 }
 
 FullModelTypeSet ToFullModelTypeSet(ModelTypeSet in) {