[Sync] Add context proto and directory 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 <string>
 
@@ skipping 849 matching lines @@
     const sync_pb::DataTypeProgressMarker& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_INT32(data_type_id);
   SET_BYTES(token);
   SET_INT64(timestamp_token_for_migration);
   SET_STR(notification_hint);
   SET(get_update_triggers, GetUpdateTriggersToValue);
   return value;
 }
 
+base::DictionaryValue* DataTypeContextToValue(
+    const sync_pb::DataTypeContext& proto) {
+  base::DictionaryValue* value = new base::DictionaryValue();
+  SET_INT32(data_type_id);
+  SET_STR(context);
+  SET_INT64(version);
+  return value;
+}
+
 base::DictionaryValue* GetUpdatesCallerInfoToValue(
     const sync_pb::GetUpdatesCallerInfo& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_ENUM(source, GetUpdatesSourceString);
   SET_BOOL(notifications_enabled);
   return value;
 }
 
 base::DictionaryValue* GetUpdatesMessageToValue(
     const sync_pb::GetUpdatesMessage& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET(caller_info, GetUpdatesCallerInfoToValue);
   SET_BOOL(fetch_folders);
   SET_INT32(batch_size);
   SET_REP(from_progress_marker, DataTypeProgressMarkerToValue);
   SET_BOOL(streaming);
   SET_BOOL(need_encryption_key);
   SET_BOOL(create_mobile_bookmarks_folder);
   SET_ENUM(get_updates_origin, GetUpdatesOriginString);
+  SET_REP(client_contexts, DataTypeContextToValue);
   return value;
 }
 
 base::DictionaryValue* ClientStatusToValue(const sync_pb::ClientStatus& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_BOOL(hierarchy_conflict_detected);
   return value;
 }
 
 base::DictionaryValue* EntryResponseToValue(
@@ skipping 18 matching lines @@
 }
 
 base::DictionaryValue* GetUpdatesResponseToValue(
     const sync_pb::GetUpdatesResponse& proto,
     bool include_specifics) {
   base::DictionaryValue* value = new base::DictionaryValue();
   value->Set("entries",
              SyncEntitiesToValue(proto.entries(), include_specifics));
   SET_INT64(changes_remaining);
   SET_REP(new_progress_marker, DataTypeProgressMarkerToValue);
+  SET_REP(context_mutations, DataTypeContextToValue);
   return value;
 }
 
 base::DictionaryValue* ClientCommandToValue(
     const sync_pb::ClientCommand& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_INT32(set_sync_poll_interval);
   SET_INT32(set_sync_long_poll_interval);
   SET_INT32(max_commit_batch_size);
   SET_INT32(sessions_commit_delay_seconds);
@@ skipping 130 matching lines @@
 #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