diff options
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/engine/commit.cc | 3 | ||||
| -rw-r--r-- | sync/test/engine/mock_connection_manager.cc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc index 2f39c23..84ab716 100644 --- a/sync/engine/commit.cc +++ b/sync/engine/commit.cc @@ -68,6 +68,9 @@ bool PrepareCommitMessage(sessions::SyncSession* session, 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); diff --git a/sync/test/engine/mock_connection_manager.cc b/sync/test/engine/mock_connection_manager.cc index f3c8ccd..419620f 100644 --- a/sync/test/engine/mock_connection_manager.cc +++ b/sync/test/engine/mock_connection_manager.cc @@ -87,6 +87,7 @@ bool MockConnectionManager::PostBufferToPath(PostBufferParams* params, browser_sync::ScopedServerStatusWatcher* watcher) { ClientToServerMessage post; CHECK(post.ParseFromString(params->buffer_in)); + CHECK(post.has_protocol_version()); last_request_.CopyFrom(post); client_stuck_ = post.sync_problem_detected(); ClientToServerResponse response; |