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

sync/engine/model_type_worker_unittest.cc

 // Copyright 2014 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/model_type_worker.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 702 matching lines @@
   ASSERT_TRUE(HasCommitResponseOnModelThread("tag1"));
   const CommitResponseData& commit_response =
       GetCommitResponseOnModelThread("tag1");
 
   // The ID changes in a commit response to initial commit.
   EXPECT_FALSE(commit_response.id.empty());
   EXPECT_NE(entity.id_string(), commit_response.id);
 
   EXPECT_EQ(client_tag_hash, commit_response.client_tag_hash);
   EXPECT_LT(0, commit_response.response_version);
+  EXPECT_LT(0, commit_response.sequence_number);
+  EXPECT_FALSE(commit_response.specifics_hash.empty());
 }
 
 TEST_F(ModelTypeWorkerTest, SimpleDelete) {
   NormalInitialize();
 
   // We can't delete an entity that was never committed.
   // Step 1 is to create and commit a new entity.
   CommitRequest("tag1", "value1");
   EXPECT_EQ(1, GetNumCommitNudges());
   ASSERT_TRUE(WillCommit());
@@ skipping 478 matching lines @@
 // disconnected.
 TEST_F(ModelTypeWorkerTest, DisconnectProcessorFromSyncTest) {
   // Initialize the worker with basic state.
   NormalInitialize();
   EXPECT_FALSE(IsProcessorDisconnected());
   ResetWorker();
   EXPECT_TRUE(IsProcessorDisconnected());
 }
 
 }  // namespace syncer_v2