Organizing model type, notification type, root tag and model type string in map.

sync/syncable/model_type.cc

 // Copyright (c) 2012 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 "sync/internal_api/public/base/model_type.h"
 
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/extension_setting_specifics.pb.h"
 #include "sync/protocol/extension_specifics.pb.h"
 #include "sync/protocol/nigori_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/theme_specifics.pb.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
 #include "sync/syncable/syncable_proto_util.h"
 
 namespace syncer {
 
+struct ModelTypeInfo {
+  const ModelType model_type;
+  const char* const notification_type;  // Model Type notification string.
+  const char* const root_tag;           // Root tag for Model Type
+  const char* const model_type_string;  // String value for Model Type
+  // Histogram value should be unique for the Model Type, Also none
+  // of these values should ever be modified, without updating "SyncModelTypes"

[Nicolas Zea, 2015/10/29 22:50:43]

To be clear, existing histogram values should never be modified period. You're
correct to point out that new ones should be added to the SyncModelTypes
histogram enum. Update the comment to clarify?

[Deepak, 2015/10/30 05:27:34]

I have updated this, Is it fine now !.

+  // enum in histograms.xml.
+  const int model_type_histogram_val;
+};
+
+const ModelTypeInfo kModelTypeInfoMap[] = {

[Nicolas Zea, 2015/10/29 22:50:43]

Add a comment explaining that these must match the ModelType enum order.

It would also be good to update model_type.h to call out that any reordering of
the enums must also be reflected here.

[Deepak, 2015/10/30 05:27:34]

Done.

+    {UNSPECIFIED, "", "", "Unspecified", 0},
+    {TOP_LEVEL_FOLDER, "", "", "Top Level Folder", 1},
+    {BOOKMARKS, "BOOKMARK", "bookmarks", "Bookmarks", 2},
+    {PREFERENCES, "PREFERENCE", "preferences", "Preferences", 3},
+    {PASSWORDS, "PASSWORD", "passwords", "Passwords", 4},
+    {AUTOFILL_PROFILE, "AUTOFILL_PROFILE", "autofill_profiles",
+     "Autofill Profiles", 5},
+    {AUTOFILL, "AUTOFILL", "autofill", "Autofill", 6},
+    {AUTOFILL_WALLET_DATA, "AUTOFILL_WALLET", "autofill_wallet",
+     "Autofill Wallet", 34},
+    {AUTOFILL_WALLET_METADATA, "AUTOFILL_WALLET_METADATA",
+     "autofill_wallet_metadata", "Autofill Wallet Metadata", 35},
+    {THEMES, "THEME", "themes", "Themes", 7},
+    {TYPED_URLS, "TYPED_URL", "typed_urls", "Typed URLs", 8},
+    {EXTENSIONS, "EXTENSION", "extensions", "Extensions", 9},
+    {SEARCH_ENGINES, "SEARCH_ENGINE", "search_engines", "Search Engines", 10},
+    {SESSIONS, "SESSION", "sessions", "Sessions", 11},
+    {APPS, "APP", "apps", "Apps", 12},
+    {APP_SETTINGS, "APP_SETTING", "app_settings", "App settings", 13},
+    {EXTENSION_SETTINGS, "EXTENSION_SETTING", "extension_settings",
+     "Extension settings", 14},
+    {APP_NOTIFICATIONS, "APP_NOTIFICATION", "app_notifications",
+     "App Notifications", 15},
+    {HISTORY_DELETE_DIRECTIVES, "HISTORY_DELETE_DIRECTIVE",
+     "history_delete_directives", "History Delete Directives", 16},
+    {SYNCED_NOTIFICATIONS, "SYNCED_NOTIFICATION", "synced_notifications",
+     "Synced Notifications", 20},
+    {SYNCED_NOTIFICATION_APP_INFO, "SYNCED_NOTIFICATION_APP_INFO",
+     "synced_notification_app_info", "Synced Notification App Info", 31},
+    {DICTIONARY, "DICTIONARY", "dictionary", "Dictionary", 22},
+    {FAVICON_IMAGES, "FAVICON_IMAGE", "favicon_images", "Favicon Images", 23},
+    {FAVICON_TRACKING, "FAVICON_TRACKING", "favicon_tracking",
+     "Favicon Tracking", 24},
+    {DEVICE_INFO, "DEVICE_INFO", "device_info", "Device Info", 18},
+    {PRIORITY_PREFERENCES, "PRIORITY_PREFERENCE", "priority_preferences",
+     "Priority Preferences", 21},
+    {SUPERVISED_USER_SETTINGS, "MANAGED_USER_SETTING", "managed_user_settings",
+     "Managed User Settings", 26},
+    {SUPERVISED_USERS, "MANAGED_USER", "managed_users", "Managed Users", 27},
+    {SUPERVISED_USER_SHARED_SETTINGS, "MANAGED_USER_SHARED_SETTING",
+     "managed_user_shared_settings", "Managed User Shared Settings", 30},
+    {ARTICLES, "ARTICLE", "articles", "Articles", 28},
+    {APP_LIST, "APP_LIST", "app_list", "App List", 29},
+    {WIFI_CREDENTIALS, "WIFI_CREDENTIAL", "wifi_credentials",
+     "WiFi Credentials", 32},
+    {SUPERVISED_USER_WHITELISTS, "MANAGED_USER_WHITELIST",
+     "managed_user_whitelists", "Managed User Whitelists", 33},
+    {PROXY_TABS, "", "", "Tabs", 25},
+    {NIGORI, "NIGORI", "nigori", "Encryption keys", 17},
+    {EXPERIMENTS, "EXPERIMENTS", "experiments", "Experiments", 19},
+};
+static_assert(arraysize(kModelTypeInfoMap) == MODEL_TYPE_COUNT,
+              "kModelTypeInfoMap should have MODEL_TYPE_COUNT elements");
+
 // Notes:
 // 1) This list must contain exactly the same elements as the set returned by
 //    UserSelectableTypes().
 // 2) This list must be in the same order as the respective values in the
 //    ModelType enum.
 const char* kUserSelectableDataTypeNames[] = {
   "bookmarks",
   "preferences",
   "passwords",
   "autofill",
@@ skipping 123 matching lines @@
 ModelType GetModelTypeFromSpecificsFieldNumber(int field_number) {
   ModelTypeSet protocol_types = ProtocolTypes();
   for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good();
        iter.Inc()) {
     if (GetSpecificsFieldNumberFromModelType(iter.Get()) == field_number)
       return iter.Get();
   }
   return UNSPECIFIED;
 }
 
 int GetSpecificsFieldNumberFromModelType(ModelType model_type) {

[Nicolas Zea, 2015/10/29 22:50:43]

Could these field numbers also be part of the struct as well?

[Deepak, 2015/10/30 05:27:34]

Changes done, Have to check "ProtocolTypes().Has(model_type)" in DCHECK as well
as in if condition as DCHECK does not work in release build.

   DCHECK(ProtocolTypes().Has(model_type))
       << "Only protocol types have field values.";
   switch (model_type) {
     case BOOKMARKS:
       return sync_pb::EntitySpecifics::kBookmarkFieldNumber;
     case PASSWORDS:
       return sync_pb::EntitySpecifics::kPasswordFieldNumber;
     case PREFERENCES:
       return sync_pb::EntitySpecifics::kPreferenceFieldNumber;
     case AUTOFILL:
@@ skipping 345 matching lines @@
   result.Put(APP_SETTINGS);
   result.Put(EXTENSION_SETTINGS);
   result.Put(PRIORITY_PREFERENCES);
   return result;
 }
 
 const char* ModelTypeToString(ModelType model_type) {
   // This is used in serialization routines as well as for displaying debug
   // information.  Do not attempt to change these string values unless you know
   // what you're doing.
-  switch (model_type) {
-    case TOP_LEVEL_FOLDER:
-      return "Top Level Folder";
-    case UNSPECIFIED:
-      return "Unspecified";
-    case BOOKMARKS:
-      return "Bookmarks";
-    case PREFERENCES:
-      return "Preferences";
-    case PASSWORDS:
-      return "Passwords";
-    case AUTOFILL:
-      return "Autofill";
-    case THEMES:
-      return "Themes";
-    case TYPED_URLS:
-      return "Typed URLs";
-    case EXTENSIONS:
-      return "Extensions";
-    case NIGORI:
-      return "Encryption keys";
-    case SEARCH_ENGINES:
-      return "Search Engines";
-    case SESSIONS:
-      return "Sessions";
-    case APPS:
-      return "Apps";
-    case APP_LIST:
-      return "App List";
-    case AUTOFILL_PROFILE:
-      return "Autofill Profiles";
-    case APP_SETTINGS:
-      return "App settings";
-    case EXTENSION_SETTINGS:
-      return "Extension settings";
-    case APP_NOTIFICATIONS:
-      return "App Notifications";
-    case HISTORY_DELETE_DIRECTIVES:
-      return "History Delete Directives";
-    case SYNCED_NOTIFICATIONS:
-      return "Synced Notifications";
-    case SYNCED_NOTIFICATION_APP_INFO:
-      return "Synced Notification App Info";
-    case DEVICE_INFO:
-      return "Device Info";
-    case EXPERIMENTS:
-      return "Experiments";
-    case PRIORITY_PREFERENCES:
-      return "Priority Preferences";
-    case DICTIONARY:
-      return "Dictionary";
-    case FAVICON_IMAGES:
-      return "Favicon Images";
-    case FAVICON_TRACKING:
-      return "Favicon Tracking";
-    case SUPERVISED_USER_SETTINGS:
-      return "Managed User Settings";
-    case SUPERVISED_USERS:
-      return "Managed Users";
-    case SUPERVISED_USER_SHARED_SETTINGS:
-      return "Managed User Shared Settings";
-    case SUPERVISED_USER_WHITELISTS:
-      return "Managed User Whitelists";
-    case ARTICLES:
-      return "Articles";
-    case WIFI_CREDENTIALS:
-      return "WiFi Credentials";
-    case PROXY_TABS:
-      return "Tabs";
-    case AUTOFILL_WALLET_DATA:
-      return "Autofill Wallet";
-    case AUTOFILL_WALLET_METADATA:
-      return "Autofill Wallet Metadata";
-    default:
-      break;
-  }
+  if (model_type >= UNSPECIFIED && model_type < MODEL_TYPE_COUNT)
+    return kModelTypeInfoMap[model_type].model_type_string;
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 // The normal rules about histograms apply here.  Always append to the bottom of
 // the list, and be careful to not reuse integer values that have already been
 // assigned.
 //
 // Don't forget to update the "SyncModelTypes" enum in histograms.xml when you
 // make changes to this list.
 int ModelTypeToHistogramInt(ModelType model_type) {
-  switch (model_type) {
-    case UNSPECIFIED:
-      return 0;
-    case TOP_LEVEL_FOLDER:
-      return 1;
-    case BOOKMARKS:
-      return 2;
-    case PREFERENCES:
-      return 3;
-    case PASSWORDS:
-      return 4;
-    case AUTOFILL_PROFILE:
-      return 5;
-    case AUTOFILL:
-      return 6;
-    case THEMES:
-      return 7;
-    case TYPED_URLS:
-      return 8;
-    case EXTENSIONS:
-      return 9;
-    case SEARCH_ENGINES:
-      return 10;
-    case SESSIONS:
-      return 11;
-    case APPS:
-      return 12;
-    case APP_SETTINGS:
-      return 13;
-    case EXTENSION_SETTINGS:
-      return 14;
-    case APP_NOTIFICATIONS:
-      return 15;
-    case HISTORY_DELETE_DIRECTIVES:
-      return 16;
-    case NIGORI:
-      return 17;
-    case DEVICE_INFO:
-      return 18;
-    case EXPERIMENTS:
-      return 19;
-    case SYNCED_NOTIFICATIONS:
-      return 20;
-    case PRIORITY_PREFERENCES:
-      return 21;
-    case DICTIONARY:
-      return 22;
-    case FAVICON_IMAGES:
-      return 23;
-    case FAVICON_TRACKING:
-      return 24;
-    case PROXY_TABS:
-      return 25;
-    case SUPERVISED_USER_SETTINGS:
-      return 26;
-    case SUPERVISED_USERS:
-      return 27;
-    case ARTICLES:
-      return 28;
-    case APP_LIST:
-      return 29;
-    case SUPERVISED_USER_SHARED_SETTINGS:
-      return 30;
-    case SYNCED_NOTIFICATION_APP_INFO:
-      return 31;
-    case WIFI_CREDENTIALS:
-      return 32;
-    case SUPERVISED_USER_WHITELISTS:
-      return 33;
-    case AUTOFILL_WALLET_DATA:
-      return 34;
-    case AUTOFILL_WALLET_METADATA:
-      return 35;
-    // Silence a compiler warning.
-    case MODEL_TYPE_COUNT:
-      return 0;
-  }
+  if (model_type >= UNSPECIFIED && model_type < MODEL_TYPE_COUNT)
+    return kModelTypeInfoMap[model_type].model_type_histogram_val;
   return 0;
 }
 
 base::StringValue* ModelTypeToValue(ModelType model_type) {
   if (model_type >= FIRST_REAL_MODEL_TYPE) {
     return new base::StringValue(ModelTypeToString(model_type));
   } else if (model_type == TOP_LEVEL_FOLDER) {
     return new base::StringValue("Top-level folder");
   } else if (model_type == UNSPECIFIED) {
     return new base::StringValue("Unspecified");
@@ skipping 11 matching lines @@
     int result;
     CHECK(value.GetAsInteger(&result));
     return ModelTypeFromInt(result);
   } else {
     NOTREACHED() << "Unsupported value type: " << value.GetType();
     return UNSPECIFIED;
   }
 }
 
 ModelType ModelTypeFromString(const std::string& model_type_string) {
-  if (model_type_string == "Bookmarks")
-    return BOOKMARKS;
-  else if (model_type_string == "Preferences")
-    return PREFERENCES;
-  else if (model_type_string == "Passwords")
-    return PASSWORDS;
-  else if (model_type_string == "Autofill")
-    return AUTOFILL;
-  else if (model_type_string == "Autofill Profiles")
-    return AUTOFILL_PROFILE;
-  else if (model_type_string == "Autofill Wallet")
-    return AUTOFILL_WALLET_DATA;
-  else if (model_type_string == "Autofill Wallet Metadata")
-    return AUTOFILL_WALLET_METADATA;
-  else if (model_type_string == "Themes")
-    return THEMES;
-  else if (model_type_string == "Typed URLs")
-    return TYPED_URLS;
-  else if (model_type_string == "Extensions")
-    return EXTENSIONS;
-  else if (model_type_string == "Encryption keys")
-    return NIGORI;
-  else if (model_type_string == "Search Engines")
-    return SEARCH_ENGINES;
-  else if (model_type_string == "Sessions")
-    return SESSIONS;
-  else if (model_type_string == "Apps")
-    return APPS;
-  else if (model_type_string == "App List")
-    return APP_LIST;
-  else if (model_type_string == "App settings")
-    return APP_SETTINGS;
-  else if (model_type_string == "Extension settings")
-    return EXTENSION_SETTINGS;
-  else if (model_type_string == "App Notifications")
-    return APP_NOTIFICATIONS;
-  else if (model_type_string == "History Delete Directives")
-    return HISTORY_DELETE_DIRECTIVES;
-  else if (model_type_string == "Synced Notifications")
-    return SYNCED_NOTIFICATIONS;
-  else if (model_type_string == "Synced Notification App Info")
-    return SYNCED_NOTIFICATION_APP_INFO;
-  else if (model_type_string == "Device Info")
-    return DEVICE_INFO;
-  else if (model_type_string == "Experiments")
-    return EXPERIMENTS;
-  else if (model_type_string == "Priority Preferences")
-    return PRIORITY_PREFERENCES;
-  else if (model_type_string == "Dictionary")
-    return DICTIONARY;
-  else if (model_type_string == "Favicon Images")
-    return FAVICON_IMAGES;
-  else if (model_type_string == "Favicon Tracking")
-    return FAVICON_TRACKING;
-  else if (model_type_string == "Managed User Settings")
-    return SUPERVISED_USER_SETTINGS;
-  else if (model_type_string == "Managed Users")
-    return SUPERVISED_USERS;
-  else if (model_type_string == "Managed User Shared Settings")
-    return SUPERVISED_USER_SHARED_SETTINGS;
-  else if (model_type_string == "Managed User Whitelists")
-    return SUPERVISED_USER_WHITELISTS;
-  else if (model_type_string == "Articles")
-    return ARTICLES;
-  else if (model_type_string == "WiFi Credentials")
-    return WIFI_CREDENTIALS;
-  else if (model_type_string == "Tabs")
-    return PROXY_TABS;
-  else
-    NOTREACHED() << "No known model type corresponding to "
-                 << model_type_string << ".";
+  if (model_type_string != "Unspecified" &&
+      model_type_string != "Top Level Folder") {
+    for (size_t i = 0; i < arraysize(kModelTypeInfoMap); ++i) {
+      if (kModelTypeInfoMap[i].model_type_string == model_type_string)
+        return kModelTypeInfoMap[i].model_type;
+    }
+  }
+  NOTREACHED() << "No known model type corresponding to " << model_type_string
+               << ".";
   return UNSPECIFIED;
 }
 
 std::string ModelTypeSetToString(ModelTypeSet model_types) {
   std::string result;
   for (ModelTypeSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
     if (!result.empty()) {
       result += ", ";
     }
     result += ModelTypeToString(it.Get());
@@ skipping 40 matching lines @@
     result.Put(ModelTypeFromValue(**i));
   }
   return result;
 }
 
 // TODO(zea): remove all hardcoded tags in model associators and have them use
 // this instead.
 // NOTE: Proxy types should return empty strings (so that we don't NOTREACHED
 // in tests when we verify they have no root node).
 std::string ModelTypeToRootTag(ModelType type) {
-  switch (type) {
-    case BOOKMARKS:
-      return "google_chrome_bookmarks";
-    case PREFERENCES:
-      return "google_chrome_preferences";
-    case PASSWORDS:
-      return "google_chrome_passwords";
-    case AUTOFILL:
-      return "google_chrome_autofill";
-    case THEMES:
-      return "google_chrome_themes";
-    case TYPED_URLS:
-      return "google_chrome_typed_urls";
-    case EXTENSIONS:
-      return "google_chrome_extensions";
-    case NIGORI:
-      return "google_chrome_nigori";
-    case SEARCH_ENGINES:
-      return "google_chrome_search_engines";
-    case SESSIONS:
-      return "google_chrome_sessions";
-    case APPS:
-      return "google_chrome_apps";
-    case APP_LIST:
-      return "google_chrome_app_list";
-    case AUTOFILL_PROFILE:
-      return "google_chrome_autofill_profiles";
-    case AUTOFILL_WALLET_DATA:
-      return "google_chrome_autofill_wallet";
-    case AUTOFILL_WALLET_METADATA:
-      return "google_chrome_autofill_wallet_metadata";
-    case APP_SETTINGS:
-      return "google_chrome_app_settings";
-    case EXTENSION_SETTINGS:
-      return "google_chrome_extension_settings";
-    case APP_NOTIFICATIONS:
-      return "google_chrome_app_notifications";
-    case HISTORY_DELETE_DIRECTIVES:
-      return "google_chrome_history_delete_directives";
-    case SYNCED_NOTIFICATIONS:
-      return "google_chrome_synced_notifications";
-    case SYNCED_NOTIFICATION_APP_INFO:
-      return "google_chrome_synced_notification_app_info";
-    case DEVICE_INFO:
-      return "google_chrome_device_info";
-    case EXPERIMENTS:
-      return "google_chrome_experiments";
-    case PRIORITY_PREFERENCES:
-      return "google_chrome_priority_preferences";
-    case DICTIONARY:
-      return "google_chrome_dictionary";
-    case FAVICON_IMAGES:
-      return "google_chrome_favicon_images";
-    case FAVICON_TRACKING:
-      return "google_chrome_favicon_tracking";
-    case SUPERVISED_USER_SETTINGS:
-      return "google_chrome_managed_user_settings";
-    case SUPERVISED_USERS:
-      return "google_chrome_managed_users";
-    case SUPERVISED_USER_SHARED_SETTINGS:
-      return "google_chrome_managed_user_shared_settings";
-    case SUPERVISED_USER_WHITELISTS:
-      return "google_chrome_managed_user_whitelists";
-    case ARTICLES:
-      return "google_chrome_articles";
-    case WIFI_CREDENTIALS:
-      return "google_chrome_wifi_credentials";
-    case PROXY_TABS:
-      return std::string();
-    default:
-      break;
-  }
+  if (IsProxyType(type))
+    return std::string();
+  if (IsRealDataType(type))
+    return "google_chrome_" + std::string(kModelTypeInfoMap[type].root_tag);
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
-// TODO(akalin): Figure out a better way to do these mappings.
-// Note: Do not include proxy types in this list. They should never receive
-// or trigger notifications.
-namespace {
-const char kBookmarkNotificationType[] = "BOOKMARK";
-const char kPreferenceNotificationType[] = "PREFERENCE";
-const char kPasswordNotificationType[] = "PASSWORD";
-const char kAutofillNotificationType[] = "AUTOFILL";
-const char kThemeNotificationType[] = "THEME";
-const char kTypedUrlNotificationType[] = "TYPED_URL";
-const char kExtensionNotificationType[] = "EXTENSION";
-const char kExtensionSettingNotificationType[] = "EXTENSION_SETTING";
-const char kNigoriNotificationType[] = "NIGORI";
-const char kAppSettingNotificationType[] = "APP_SETTING";
-const char kAppNotificationType[] = "APP";
-const char kAppListNotificationType[] = "APP_LIST";
-const char kSearchEngineNotificationType[] = "SEARCH_ENGINE";
-const char kSessionNotificationType[] = "SESSION";
-const char kAutofillProfileNotificationType[] = "AUTOFILL_PROFILE";
-const char kAutofillWalletMetadataNotificationType[] =
-    "AUTOFILL_WALLET_METADATA";
-const char kAutofillWalletNotificationType[] = "AUTOFILL_WALLET";
-const char kAppNotificationNotificationType[] = "APP_NOTIFICATION";
-const char kHistoryDeleteDirectiveNotificationType[] =
-    "HISTORY_DELETE_DIRECTIVE";
-const char kSyncedNotificationType[] = "SYNCED_NOTIFICATION";
-const char kSyncedNotificationAppInfoType[] = "SYNCED_NOTIFICATION_APP_INFO";
-const char kDeviceInfoNotificationType[] = "DEVICE_INFO";
-const char kExperimentsNotificationType[] = "EXPERIMENTS";
-const char kPriorityPreferenceNotificationType[] = "PRIORITY_PREFERENCE";
-const char kDictionaryNotificationType[] = "DICTIONARY";
-const char kFaviconImageNotificationType[] = "FAVICON_IMAGE";
-const char kFaviconTrackingNotificationType[] = "FAVICON_TRACKING";
-const char kSupervisedUserSettingNotificationType[] = "MANAGED_USER_SETTING";
-const char kSupervisedUserNotificationType[] = "MANAGED_USER";
-const char kSupervisedUserSharedSettingNotificationType[] =
-    "MANAGED_USER_SHARED_SETTING";
-const char kSupervisedUserWhitelistNotificationType[] =
-    "MANAGED_USER_WHITELIST";
-const char kArticleNotificationType[] = "ARTICLE";
-const char kWifiCredentialNotificationType[] = "WIFI_CREDENTIAL";
-}  // namespace
-
 bool RealModelTypeToNotificationType(ModelType model_type,
                                      std::string* notification_type) {
-  switch (model_type) {
-    case BOOKMARKS:
-      *notification_type = kBookmarkNotificationType;
-      return true;
-    case PREFERENCES:
-      *notification_type = kPreferenceNotificationType;
-      return true;
-    case PASSWORDS:
-      *notification_type = kPasswordNotificationType;
-      return true;
-    case AUTOFILL:
-      *notification_type = kAutofillNotificationType;
-      return true;
-    case THEMES:
-      *notification_type = kThemeNotificationType;
-      return true;
-    case TYPED_URLS:
-      *notification_type = kTypedUrlNotificationType;
-      return true;
-    case EXTENSIONS:
-      *notification_type = kExtensionNotificationType;
-      return true;
-    case NIGORI:
-      *notification_type = kNigoriNotificationType;
-      return true;
-    case APP_SETTINGS:
-      *notification_type = kAppSettingNotificationType;
-      return true;
-    case APPS:
-      *notification_type = kAppNotificationType;
-      return true;
-    case APP_LIST:
-      *notification_type = kAppListNotificationType;
-      return true;
-    case SEARCH_ENGINES:
-      *notification_type = kSearchEngineNotificationType;
-      return true;
-    case SESSIONS:
-      *notification_type = kSessionNotificationType;
-      return true;
-    case AUTOFILL_PROFILE:
-      *notification_type = kAutofillProfileNotificationType;
-      return true;
-    case AUTOFILL_WALLET_DATA:
-      *notification_type = kAutofillWalletNotificationType;
-      return true;
-    case AUTOFILL_WALLET_METADATA:
-      *notification_type = kAutofillWalletMetadataNotificationType;
-      return true;
-    case EXTENSION_SETTINGS:
-      *notification_type = kExtensionSettingNotificationType;
-      return true;
-    case APP_NOTIFICATIONS:
-      *notification_type = kAppNotificationNotificationType;
-      return true;
-    case HISTORY_DELETE_DIRECTIVES:
-      *notification_type = kHistoryDeleteDirectiveNotificationType;
-      return true;
-    case SYNCED_NOTIFICATIONS:
-      *notification_type = kSyncedNotificationType;
-      return true;
-    case SYNCED_NOTIFICATION_APP_INFO:
-      *notification_type = kSyncedNotificationAppInfoType;
-      return true;
-    case DEVICE_INFO:
-      *notification_type = kDeviceInfoNotificationType;
-      return true;
-    case EXPERIMENTS:
-      *notification_type = kExperimentsNotificationType;
-      return true;
-    case PRIORITY_PREFERENCES:
-      *notification_type = kPriorityPreferenceNotificationType;
-      return true;
-    case DICTIONARY:
-      *notification_type = kDictionaryNotificationType;
-      return true;
-    case FAVICON_IMAGES:
-      *notification_type = kFaviconImageNotificationType;
-      return true;
-    case FAVICON_TRACKING:
-      *notification_type = kFaviconTrackingNotificationType;
-      return true;
-    case SUPERVISED_USER_SETTINGS:
-      *notification_type = kSupervisedUserSettingNotificationType;
-      return true;
-    case SUPERVISED_USERS:
-      *notification_type = kSupervisedUserNotificationType;
-      return true;
-    case SUPERVISED_USER_SHARED_SETTINGS:
-      *notification_type = kSupervisedUserSharedSettingNotificationType;
-      return true;
-    case SUPERVISED_USER_WHITELISTS:
-      *notification_type = kSupervisedUserWhitelistNotificationType;
-      return true;
-    case ARTICLES:
-      *notification_type = kArticleNotificationType;
-      return true;
-    case WIFI_CREDENTIALS:
-      *notification_type = kWifiCredentialNotificationType;
-      return true;
-    default:
-      break;
+  if (!ProtocolTypes().Has(model_type)) {

[Nicolas Zea, 2015/10/29 22:50:43]

You can remove this condition right? And make the one below be if
(IsProtocolType(...)). 

[Deepak, 2015/10/30 05:27:34]

Done.

+    notification_type->clear();
+    return false;
+  }
+  if (model_type >= BOOKMARKS && model_type < MODEL_TYPE_COUNT) {
+    *notification_type = kModelTypeInfoMap[model_type].notification_type;
+    return true;
   }
   notification_type->clear();
   return false;
 }
 
 bool NotificationTypeToRealModelType(const std::string& notification_type,
                                      ModelType* model_type) {
-  if (notification_type == kBookmarkNotificationType) {
-    *model_type = BOOKMARKS;
-    return true;
-  } else if (notification_type == kPreferenceNotificationType) {
-    *model_type = PREFERENCES;
-    return true;
-  } else if (notification_type == kPasswordNotificationType) {
-    *model_type = PASSWORDS;
-    return true;
-  } else if (notification_type == kAutofillNotificationType) {
-    *model_type = AUTOFILL;
-    return true;
-  } else if (notification_type == kThemeNotificationType) {
-    *model_type = THEMES;
-    return true;
-  } else if (notification_type == kTypedUrlNotificationType) {
-    *model_type = TYPED_URLS;
-    return true;
-  } else if (notification_type == kExtensionNotificationType) {
-    *model_type = EXTENSIONS;
-    return true;
-  } else if (notification_type == kNigoriNotificationType) {
-    *model_type = NIGORI;
-    return true;
-  } else if (notification_type == kAppNotificationType) {
-    *model_type = APPS;
-    return true;
-  } else if (notification_type == kAppListNotificationType) {
-    *model_type = APP_LIST;
-    return true;
-  } else if (notification_type == kSearchEngineNotificationType) {
-    *model_type = SEARCH_ENGINES;
-    return true;
-  } else if (notification_type == kSessionNotificationType) {
-    *model_type = SESSIONS;
-    return true;
-  } else if (notification_type == kAutofillProfileNotificationType) {
-    *model_type = AUTOFILL_PROFILE;
-    return true;
-  } else if (notification_type == kAutofillWalletNotificationType) {
-    *model_type = AUTOFILL_WALLET_DATA;
-    return true;
-  } else if (notification_type == kAutofillWalletMetadataNotificationType) {
-    *model_type = AUTOFILL_WALLET_METADATA;
-    return true;
-  } else if (notification_type == kAppSettingNotificationType) {
-    *model_type = APP_SETTINGS;
-    return true;
-  } else if (notification_type == kExtensionSettingNotificationType) {
-    *model_type = EXTENSION_SETTINGS;
-    return true;
-  } else if (notification_type == kAppNotificationNotificationType) {
-    *model_type = APP_NOTIFICATIONS;
-    return true;
-  } else if (notification_type == kHistoryDeleteDirectiveNotificationType) {
-    *model_type = HISTORY_DELETE_DIRECTIVES;
-    return true;
-  } else if (notification_type == kSyncedNotificationType) {
-    *model_type = SYNCED_NOTIFICATIONS;
-    return true;
-  } else if (notification_type == kSyncedNotificationAppInfoType) {
-    *model_type = SYNCED_NOTIFICATION_APP_INFO;
-    return true;
-  } else if (notification_type == kDeviceInfoNotificationType) {
-    *model_type = DEVICE_INFO;
-    return true;
-  } else if (notification_type == kExperimentsNotificationType) {
-    *model_type = EXPERIMENTS;
-    return true;
-  } else if (notification_type == kPriorityPreferenceNotificationType) {
-    *model_type = PRIORITY_PREFERENCES;
-    return true;
-  } else if (notification_type == kDictionaryNotificationType) {
-    *model_type = DICTIONARY;
-    return true;
-  } else if (notification_type == kFaviconImageNotificationType) {
-    *model_type = FAVICON_IMAGES;
-    return true;
-  } else if (notification_type == kFaviconTrackingNotificationType) {
-    *model_type = FAVICON_TRACKING;
-    return true;
-  } else if (notification_type == kSupervisedUserSettingNotificationType) {
-    *model_type = SUPERVISED_USER_SETTINGS;
-    return true;
-  } else if (notification_type == kSupervisedUserNotificationType) {
-    *model_type = SUPERVISED_USERS;
-    return true;
-  } else if (notification_type ==
-      kSupervisedUserSharedSettingNotificationType) {
-    *model_type = SUPERVISED_USER_SHARED_SETTINGS;
-    return true;
-  } else if (notification_type == kSupervisedUserWhitelistNotificationType) {
-    *model_type = SUPERVISED_USER_WHITELISTS;
-    return true;
-  } else if (notification_type == kArticleNotificationType) {
-    *model_type = ARTICLES;
-    return true;
-  } else if (notification_type == kWifiCredentialNotificationType) {
-    *model_type = WIFI_CREDENTIALS;
-    return true;
+  if (notification_type.empty()) {
+    *model_type = UNSPECIFIED;
+    return false;
+  }
+  for (size_t i = 0; i < arraysize(kModelTypeInfoMap); ++i) {
+    if (kModelTypeInfoMap[i].notification_type == notification_type) {
+      *model_type = kModelTypeInfoMap[i].model_type;
+      return true;
+    }
   }
   *model_type = UNSPECIFIED;
   return false;
 }
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 bool IsProxyType(ModelType model_type) {
@@ skipping 16 matching lines @@
 bool TypeSupportsHierarchy(ModelType model_type) {
   // TODO(stanisc): crbug/438313: Should this also include TOP_LEVEL_FOLDER?
   return model_type == BOOKMARKS;
 }
 
 bool TypeSupportsOrdering(ModelType model_type) {
   return model_type == BOOKMARKS;
 }
 
 }  // namespace syncer