[Sync] USS: Ignore encryption changes during conflict resolution 1/2

sync/test/engine/mock_model_type_worker.cc

Index: sync/test/engine/mock_model_type_worker.cc
diff --git a/sync/test/engine/mock_model_type_worker.cc b/sync/test/engine/mock_model_type_worker.cc
index 4aabfd36f60616730ea42648b66d60fab7f0f1fe..fd0866738d763b1c8516e682f304ae65ff2cd302 100644
--- a/sync/test/engine/mock_model_type_worker.cc
+++ b/sync/test/engine/mock_model_type_worker.cc
@@ -206,6 +206,7 @@ CommitResponseData MockModelTypeWorker::SuccessfulCommitResponse(
 
   response_data.client_tag_hash = client_tag_hash;
   response_data.sequence_number = request_data.sequence_number;
+  response_data.specifics_hash = request_data.specifics_hash;
 
   // Increment the server version on successful commit.
   int64_t version = GetServerVersion(client_tag_hash);