sync: Add DeviceInfo protobuf and supporting code

sync/protocol/nigori_specifics.proto

 // 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.
 //
 // Sync protocol datatype extension for nigori keys.
 
 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change
 // any fields in this file.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 option retain_unknown_fields = true;
 
 package sync_pb;
 
 import "encryption.proto";
 
 message NigoriKey {
   optional string name = 1;
   optional bytes user_key = 2;
   optional bytes encryption_key = 3;
   optional bytes mac_key = 4;
 }
 
 message NigoriKeyBag {
   repeated NigoriKey key = 2;
 }
 
-// Information about a device that is running a sync-enabled Chrome browser.
-// We are mapping the unique per-device cache guid to more specific information
-// about the device.
-message DeviceInformation {
-  optional string cache_guid = 1;
-
-  // The name of the device is dependent on the OS running the Chrome instance.
-  // On a Chromebook this is "Chromebook", on Linux the distribution name, on
-  // Mac OSX the hadware model name and on Windows the computer name.
-  optional string name = 2;
-
-  // The platform of the device (ChromeOS, Linux, Mac, or Windows).
-  optional string platform = 3;
-
-  // The Chrome version of the sync-enabled Chrome browser.
-  optional string chrome_version = 4;
-}
-
 // Properties of nigori sync object.
 message NigoriSpecifics {
   optional EncryptedData encryption_keybag = 1;
   // Once keystore migration is performed, we have to freeze the keybag so that
   // older clients (that don't support keystore encryption) do not attempt to
   // update the keybag.
   // Previously |using_explicit_passphrase|.
   optional bool keybag_is_frozen = 2;
 
   // Obsolete encryption fields. These were deprecated due to legacy versions
@@ skipping 27 matching lines @@
 
   // If true, all current and future datatypes will be encrypted.
   optional bool encrypt_everything = 24;
 
   optional bool encrypt_extension_settings = 25;
   optional bool encrypt_app_notifications = 26;
   optional bool encrypt_app_settings = 27;
 
   // User device information. Contains information about each device that has a
   // sync-enabled Chrome browser connected to the user account.
-  repeated DeviceInformation device_information = 28;
+  // This has been moved to the DeviceInfo message.
+  // repeated DeviceInformation deprecated_device_information = 28;
 
   // Enable syncing favicons as part of tab sync.
   optional bool sync_tab_favicons = 29;
 
   // The state of the passphrase required to decrypt |encryption_keybag|.
   enum PassphraseType {
     // Gaia-based encryption passphrase. Deprecated.
     IMPLICIT_PASSPHRASE = 1;
     // Keystore key encryption passphrase. Uses |keystore_bootstrap| to
     // decrypt |encryption_keybag|.
     KEYSTORE_PASSPHRASE = 2;
     // Previous Gaia-based passphrase frozen and treated as a custom passphrase.
     FROZEN_IMPLICIT_PASSPHRASE  = 3;
     // User provided custom passphrase.
     CUSTOM_PASSPHRASE = 4;
   }
   optional PassphraseType passphrase_type = 30
       [default = IMPLICIT_PASSPHRASE];
 
   // The keystore decryptor token blob. Encrypted with the keystore key, and
   // contains the encryption key used to decrypt |encryption_keybag|.
   // Only set if passphrase_state == KEYSTORE_PASSPHRASE.
   optional EncryptedData keystore_decryptor_token = 31;
 
   // The time (in epoch milliseconds) at which the keystore migration was
   // performed.
   optional int64 keystore_migration_time = 32;
 }