Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/write_node.cc

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pull whole protobuf Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/sync_manager_impl_unittest.cc ('k') | third_party/protobuf/.gitignore » ('j') | third_party/protobuf/README.chromium » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/write_node.cc
diff --git a/sync/internal_api/write_node.cc b/sync/internal_api/write_node.cc
index 0f57315122004a3a470ec2156c3c7c8a40938948..e11c88e3ada409a60efc3689eea714e9faf8298e 100644
--- a/sync/internal_api/write_node.cc
+++ b/sync/internal_api/write_node.cc
@@ -163,8 +163,8 @@ void WriteNode::SetEntitySpecifics(
const sync_pb::EntitySpecifics& old_specifics = entry_->GetSpecifics();
sync_pb::EntitySpecifics new_specifics;
new_specifics.CopyFrom(new_value);
- new_specifics.mutable_unknown_fields()->MergeFrom(
- old_specifics.unknown_fields());
+ new_specifics.mutable_unknown_fields()
+ ->append(old_specifics.unknown_fields());
// Will update the entry if encryption was necessary.
if (!UpdateEntryWithEncryption(GetTransaction()->GetWrappedTrans(),
« no previous file with comments | « sync/internal_api/sync_manager_impl_unittest.cc ('k') | third_party/protobuf/.gitignore » ('j') | third_party/protobuf/README.chromium » ('J')

Powered by Google App Engine
This is Rietveld 408576698