[Sync] Implement keystore migration support.

sync/protocol/proto_value_conversions.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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_value_conversions.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 275 matching lines @@
   SET_STR(update_url);
   SET_BOOL(enabled);
   SET_BOOL(incognito_enabled);
   SET_STR(name);
   return value;
 }
 
 DictionaryValue* NigoriSpecificsToValue(
     const sync_pb::NigoriSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
-  SET(encrypted, EncryptedDataToValue);
-  SET_BOOL(using_explicit_passphrase);
+  SET(encryption_keybag, EncryptedDataToValue);
+  SET_BOOL(keybag_is_frozen);
   SET_BOOL(encrypt_bookmarks);
   SET_BOOL(encrypt_preferences);
   SET_BOOL(encrypt_autofill_profile);
   SET_BOOL(encrypt_autofill);
   SET_BOOL(encrypt_themes);
   SET_BOOL(encrypt_typed_urls);
   SET_BOOL(encrypt_extension_settings);
   SET_BOOL(encrypt_extensions);
   SET_BOOL(encrypt_sessions);
   SET_BOOL(encrypt_app_settings);
   SET_BOOL(encrypt_apps);
   SET_BOOL(encrypt_search_engines);
   SET_BOOL(encrypt_everything);
   SET_REP(device_information, DeviceInformationToValue);
   SET_BOOL(sync_tab_favicons);
+  SET_ENUM(passphrase_type, PassphraseTypeString);
+  SET(keystore_decryptor_token, EncryptedDataToValue);
+  SET_INT64(keystore_migration_time);
   return value;
 }
 
 DictionaryValue* PasswordSpecificsToValue(
     const sync_pb::PasswordSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
   SET(encrypted, EncryptedDataToValue);
   return value;
 }
 
@@ skipping 249 matching lines @@
     value->Set("commit",
                CommitMessageToValue(proto.commit(), include_specifics));
   }
 
   SET(get_updates, GetUpdatesMessageToValue);
   SET_STR(store_birthday);
   SET_BOOL(sync_problem_detected);
   return value;
 }
 
-
 #undef SET
 #undef SET_REP
 
 #undef SET_BOOL
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 #undef SET_STR_REP
 
 #undef SET_FIELD
 
 }  // namespace syncer