[Sync] Add two more USS integration tests.

components/sync/engine_impl/worker_entity_tracker.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_ENGINE_IMPL_WORKER_ENTITY_TRACKER_H_
 #define COMPONENTS_SYNC_ENGINE_IMPL_WORKER_ENTITY_TRACKER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 38 matching lines @@
   // Updates this entity with data from the latest version that the
   // model asked us to commit.  May clobber state related to the
   // model's previous commit attempt(s).
   void RequestCommit(const CommitRequestData& data);
 
   // Tracks the receipt of a commit response and fills in some local-only data
   // on it to be passed back to the processor.
   void ReceiveCommitResponse(CommitResponseData* ack);
 
   // Handles receipt of an update from the server.
-  void ReceiveUpdate(int64_t version);
+  void ReceiveUpdate(const UpdateResponseData& update);
 
   // Handles the receipt of an encrypted update from the server.
   //
   // Returns true if the tracker decides this item is worth keeping.  Returns
   // false if the item is discarded, which could happen if the version number
   // is out of date.
   bool ReceiveEncryptedUpdate(const UpdateResponseData& data);
 
   // Functions to fetch the latest encrypted update.
   bool HasEncryptedUpdate() const;
@@ skipping 15 matching lines @@
   // Checks if the server knows about this item.
   bool IsServerKnown() const;
 
   // Clears flag and optionally clears state associated with a pending commit.
   void ClearPendingCommit();
 
   // The ID for this entry.  May be empty if the entry has never been committed.
   std::string id_;
 
   // The hashed client tag for this entry.
-  std::string client_tag_hash_;
+  const std::string client_tag_hash_;
 
   // The highest version seen in a commit response for this entry.
   int64_t highest_commit_response_version_;
 
   // The highest version seen in a GU response for this entry.
   int64_t highest_gu_response_version_;
 
   // Used to track in-flight commit requests on the model thread.  All we need
   // to do here is return it back to the model thread when the pending commit
   // is completed and confirmed.  Not valid if no commit is pending.
@@ skipping 12 matching lines @@
   // of an pending update prevents commits.  As of this writing, the only
   // source of pending updates is updates that can't currently be decrypted.
   std::unique_ptr<UpdateResponseData> encrypted_update_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkerEntityTracker);
 };
 
 }  // namespace syncer_v2
 
 #endif  // COMPONENTS_SYNC_ENGINE_IMPL_WORKER_ENTITY_TRACKER_H_