Add CompoundSyncable class for synchronizing containers of Syncables.

blimp/helium/lww_register.h

 // Copyright 2016 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.
 
 #ifndef BLIMP_HELIUM_LWW_REGISTER_H_
 #define BLIMP_HELIUM_LWW_REGISTER_H_
 
 #include "base/memory/ptr_util.h"
 #include "blimp/helium/blimp_helium_export.h"
 #include "blimp/helium/coded_value_serializer.h"
@@ skipping 68 matching lines @@
   CodedValueSerializer::Serialize(last_modified_, output_stream);
   CodedValueSerializer::Serialize(value_, output_stream);
 }
 
 template <class RegisterType>
 Result LwwRegister<RegisterType>::ApplyChangeset(
     Revision to,
     google::protobuf::io::CodedInputStream* input_stream) {
   VersionVector remote;
   if (!CodedValueSerializer::Deserialize(input_stream, &remote)) {
-    return Result::ERR_INTERNAL_ERROR;
+    return Result::ERR_PROTOCOL_ERROR;
   }
   remote = remote.Invert();
   VersionVector::Comparison cmp = last_modified_.CompareTo(remote);
+
+  RegisterType input_value;
+  if (!CodedValueSerializer::Deserialize(input_stream, &input_value)) {
+    return Result::ERR_PROTOCOL_ERROR;
+  }
   if (cmp == VersionVector::Comparison::LessThan ||
       (cmp == VersionVector::Comparison::Conflict && !locally_owned_)) {
-    if (!CodedValueSerializer::Deserialize(input_stream, &value_)) {
-      return Result::ERR_INTERNAL_ERROR;
-    }
+    value_ = input_value;
     value_set_ = true;
   }
+
   last_modified_ = last_modified_.MergeWith(remote);
   return Result::SUCCESS;
 }
 
 template <class RegisterType>
 void LwwRegister<RegisterType>::ReleaseBefore(Revision checkpoint) {
   // no-op
 }
 
 }  // namespace helium
 }  // namespace blimp
 
 #endif  // BLIMP_HELIUM_LWW_REGISTER_H_