[Sync] Fixing two bugs in the worker revealed by trying to add an encryption integration test.

components/sync/engine_impl/worker_entity_tracker.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 "components/sync/engine_impl/worker_entity_tracker.h"
 
-#include <stdint.h>
+#include <algorithm>
 
 #include "base/logging.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/time.h"
 #include "components/sync/syncable/syncable_util.h"
 
 namespace syncer_v2 {
 
 WorkerEntityTracker::WorkerEntityTracker(const std::string& client_tag_hash)
     : client_tag_hash_(client_tag_hash) {
@@ skipping 71 matching lines @@
   // There's no need to inform the model thread of the conflict. The
   // conflicting update has already been posted to its task runner; it will
   // figure it out as soon as it runs that task.
   //
   // Note that this check must be after pending_commit_ is set.
   if (IsInConflict()) {
     ClearPendingCommit();
     return;
   }
 
+  // There's no conflict; increase base_version_ if there was a commit response
+  // the processor didn't know about.
+  base_version_ = std::max(base_version_, highest_commit_response_version_);
+
   // Otherwise, keep the data associated with this pending commit
   // so it can be committed at the next possible opportunity.
 }
 
 void WorkerEntityTracker::ReceiveCommitResponse(CommitResponseData* ack) {
   DCHECK_GT(ack->response_version, highest_commit_response_version_)
       << "Had expected higher response version."
       << " id: " << id_;
 
   // Commit responses, especially after the first commit, can update our ID.
@@ skipping 80 matching lines @@
 bool WorkerEntityTracker::IsServerKnown() const {
   return base_version_ != kUncommittedVersion;
 }
 
 void WorkerEntityTracker::ClearPendingCommit() {
   pending_commit_.reset();
   pending_commit_specifics_hash_.clear();
 }
 
 }  // namespace syncer_v2