[Sync] Add history delete directive type

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/string_split.h"
 #include "base/values.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
@@ skipping 55 matching lines @@
       break;
     case APP_SETTINGS:
       specifics->mutable_app_setting();
       break;
     case EXTENSION_SETTINGS:
       specifics->mutable_extension_setting();
       break;
     case APP_NOTIFICATIONS:
       specifics->mutable_app_notification();
       break;
+    case HISTORY_DELETE_DIRECTIVES:
+      specifics->mutable_history_delete_directive();
+      break;
     case DEVICE_INFO:
       specifics->mutable_device_info();
       break;
     default:
       NOTREACHED() << "No known extension for model type.";
   }
 }
 
 ModelType GetModelTypeFromSpecificsFieldNumber(int field_number) {
   for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
@@ skipping 45 matching lines @@
       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 DEVICE_INFO:
       return sync_pb::EntitySpecifics::kDeviceInfoFieldNumber;
       break;
     default:
       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) {
   FullModelTypeSet out;
   for (ModelTypeSet::Iterator i = in.First(); i.Good(); i.Inc()) {
     out.Put(i.Get());
   }
   return out;
 }
 
-// Note: keep this consistent with GetModelType in syncable.cc!
+// Note: keep this consistent with GetModelType in entry.cc!
 ModelType GetModelType(const sync_pb::SyncEntity& sync_entity) {
   DCHECK(!IsRoot(sync_entity));  // Root shouldn't ever go over the wire.
 
   if (sync_entity.deleted())
     return UNSPECIFIED;
 
   // Backwards compatibility with old (pre-specifics) protocol.
   if (sync_entity.has_bookmarkdata())
     return BOOKMARKS;
 
@@ skipping 54 matching lines @@
 
   if (specifics.has_app_setting())
     return APP_SETTINGS;
 
   if (specifics.has_extension_setting())
     return EXTENSION_SETTINGS;
 
   if (specifics.has_app_notification())
     return APP_NOTIFICATIONS;
 
+  if (specifics.has_history_delete_directive())
+    return HISTORY_DELETE_DIRECTIVES;
+
   if (specifics.has_device_info())
     return DEVICE_INFO;
 
   return UNSPECIFIED;
 }
 
 bool ShouldMaintainPosition(ModelType model_type) {
   return model_type == BOOKMARKS;
 }
 
@@ skipping 53 matching lines @@
     case APPS:
       return "Apps";
     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 DEVICE_INFO:
       return "Device Info";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 StringValue* ModelTypeToValue(ModelType model_type) {
@@ skipping 47 matching lines @@
   else if (model_type_string == "Sessions")
     return SESSIONS;
   else if (model_type_string == "Apps")
     return APPS;
   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 == "Device Info")
     return DEVICE_INFO;
   else
     NOTREACHED() << "No known model type corresponding to "
                  << model_type_string << ".";
   return UNSPECIFIED;
 }
 
 std::string ModelTypeSetToString(ModelTypeSet model_types) {
   std::string result;
@@ skipping 50 matching lines @@
     case APPS:
       return "google_chrome_apps";
     case AUTOFILL_PROFILE:
       return "google_chrome_autofill_profiles";
     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 DEVICE_INFO:
       return "google_chrome_device_info";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 // TODO(akalin): Figure out a better way to do these mappings.
 
 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 kSearchEngineNotificationType[] = "SEARCH_ENGINE";
 const char kSessionNotificationType[] = "SESSION";
 const char kAutofillProfileNotificationType[] = "AUTOFILL_PROFILE";
 const char kAppNotificationNotificationType[] = "APP_NOTIFICATION";
+const char kHistoryDeleteDirectiveNotificationType[] =
+    "HISTORY_DELETE_DIRECTIVE";
 const char kDeviceInfoNotificationType[] = "DEVICE_INFO";
 }  // namespace
 
 bool RealModelTypeToNotificationType(ModelType model_type,
                                      std::string* notification_type) {
   switch (model_type) {
     case BOOKMARKS:
       *notification_type = kBookmarkNotificationType;
       return true;
     case PREFERENCES:
@@ skipping 31 matching lines @@
       return true;
     case AUTOFILL_PROFILE:
       *notification_type = kAutofillProfileNotificationType;
       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;
     case DEVICE_INFO:
       *notification_type = kDeviceInfoNotificationType;
       return true;
     default:
       break;
   }
   notification_type->clear();
   return false;
 }
 
@@ skipping 37 matching lines @@
     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;
   } else if (notification_type == kDeviceInfoNotificationType) {
     *model_type = DEVICE_INFO;;
     return true;
-  } else {
-    *model_type = UNSPECIFIED;
-    return false;
   }
+  *model_type = UNSPECIFIED;
+  return false;
 }
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 }  // namespace syncer