Merge 144339 - sync: Set explicit protocol_version on commit

sync/engine/commit.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.
 
 #include "sync/engine/commit.h"
 
 #include "base/debug/trace_event.h"
 #include "sync/engine/build_commit_command.h"
 #include "sync/engine/get_commit_ids_command.h"
 #include "sync/engine/process_commit_response_command.h"
@@ skipping 50 matching lines @@
 // the commit message which should be sent to the server.  It is valid iff the
 // return value of this function is true.
 bool PrepareCommitMessage(sessions::SyncSession* session,
                           sessions::OrderedCommitSet* commit_set,
                           ClientToServerMessage* commit_message) {
   TRACE_EVENT0("sync", "PrepareCommitMessage");
 
   commit_set->Clear();
   commit_message->Clear();
 
+  // TODO(134769): This is a temporary fix for crbug.com/134715.
+  commit_message->set_protocol_version(commit_message->protocol_version());
+
   WriteTransaction trans(FROM_HERE, SYNCER, session->context()->directory());
   sessions::ScopedSetSessionWriteTransaction set_trans(session, &trans);
 
   // Fetch the items to commit.
   const size_t batch_size = session->context()->max_commit_batch_size();
   GetCommitIdsCommand get_commit_ids_command(batch_size, commit_set);
   get_commit_ids_command.Execute(session);
 
   DVLOG(1) << "Commit message will contain " << commit_set->Size() << " items.";
   if (commit_set->Empty()) {
@@ skipping 63 matching lines @@
                                 sessions::SyncSession* session) {
   sessions::OrderedCommitSet commit_set(session->routing_info());
   SyncerError result = BuildAndPostCommitsImpl(syncer, session, &commit_set);
   if (result != SYNCER_OK) {
     ClearSyncingBits(session->context()->directory(), commit_set);
   }
   return result;
 }
 
 }  // namespace browser_sync