sync: Add DeviceInfo protobuf and supporting code

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 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) {
     ModelType model_type = ModelTypeFromInt(i);
     if (GetSpecificsFieldNumberFromModelType(model_type) == field_number)
       return model_type;
@@ skipping 42 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 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) {
@@ skipping 72 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_device_info())
+    return DEVICE_INFO;
+
   return UNSPECIFIED;
 }
 
 bool ShouldMaintainPosition(ModelType model_type) {
   return model_type == BOOKMARKS;
 }
 
 ModelTypeSet UserTypes() {
   ModelTypeSet set;
   for (int i = FIRST_USER_MODEL_TYPE; i <= LAST_USER_MODEL_TYPE; ++i) {
     set.Put(ModelTypeFromInt(i));
   }
   return set;
 }
 
 ModelTypeSet ControlTypes() {
   ModelTypeSet set;
   for (int i = FIRST_CONTROL_MODEL_TYPE; i <= LAST_CONTROL_MODEL_TYPE; ++i) {
     set.Put(ModelTypeFromInt(i));
   }
+
+  // TODO(rlarocque): Re-enable this when the server supports it.
+  set.Remove(DEVICE_INFO);

[Nicolas Zea, 2012/09/26 01:50:59]

What is this for?

[rlarocque, 2012/09/26 20:44:36]

The server doesn't currently support this type.  If it wasn't for this line,
sync would fail to initialize.

+
   return set;
 }
 
 bool IsControlType(ModelType model_type) {
   return ControlTypes().Has(model_type);
 }
 
 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
@@ skipping 26 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 DEVICE_INFO:
+      return "Device Info";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 StringValue* ModelTypeToValue(ModelType model_type) {
   if (model_type >= FIRST_REAL_MODEL_TYPE) {
     return Value::CreateStringValue(ModelTypeToString(model_type));
@@ skipping 45 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 == "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;
   for (ModelTypeSet::Iterator it = model_types.First(); it.Good(); it.Inc()) {
     if (!result.empty()) {
@@ skipping 48 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 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 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:
       *notification_type = kPreferenceNotificationType;
@@ skipping 30 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 DEVICE_INFO:
+      *notification_type = kDeviceInfoNotificationType;
+      return true;
     default:
       break;
   }
   notification_type->clear();
   return false;
 }
 
 bool NotificationTypeToRealModelType(const std::string& notification_type,
                                      ModelType* model_type) {
   if (notification_type == kBookmarkNotificationType) {
@@ skipping 34 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 == kDeviceInfoNotificationType) {
+    *model_type = DEVICE_INFO;;
+    return true;
   } else {
     *model_type = UNSPECIFIED;
     return false;
   }
 }
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 }  // namespace syncer