Revert "Revert 182527" ([Sync] Make SESSIONS an implicit type)

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 602 matching lines @@
 }
 
 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);
   return value;
 }
 
 base::DictionaryValue* ClientStatusToValue(const sync_pb::ClientStatus& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_BOOL(hierarchy_conflict_detected);
   return value;
 }
 
@@ skipping 137 matching lines @@
   SET_INT32(num_updates_downloaded);
   SET_INT32(num_reflected_updates_downloaded);
   SET(caller_info, GetUpdatesCallerInfoToValue);
   return value;
 }
 
 base::DictionaryValue* ClientConfigParamsToValue(
     const sync_pb::ClientConfigParams& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_INT32_REP(enabled_type_ids);
+  SET_BOOL(tabs_datatype_enabled);
   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