sync: Finish non-blocking type encryption 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 879 matching lines @@
 }
 
 base::DictionaryValue* GetUpdateTriggersToValue(
     const sync_pb::GetUpdateTriggers& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_STR_REP(notification_hint);
   SET_BOOL(client_dropped_hints);
   SET_BOOL(invalidations_out_of_sync);
   SET_INT64(local_modification_nudges);
   SET_INT64(datatype_refresh_nudges);
-  SET_BOOL(initial_sync_in_progress);
   return value;
 }
 
 base::DictionaryValue* DataTypeProgressMarkerToValue(
     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);
@@ skipping 212 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