sync: Implement per-type update processing

sync/test/engine/mock_connection_manager.cc

 // Copyright 2012 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.
 //
 // Mock ServerConnectionManager class for use in client regression tests.
 
 #include "sync/test/engine/mock_connection_manager.h"
 
 #include <map>
 
@@ skipping 515 matching lines @@
     }
   }
 
   response->mutable_get_updates()->CopyFrom(*updates);
 
   // Set appropriate progress markers, overriding the value squirreled
   // away by ApplyToken().
   std::string token = response->get_updates().new_progress_marker(0).token();
   response->mutable_get_updates()->clear_new_progress_marker();
   for (int i = 0; i < gu.from_progress_marker_size(); ++i) {
-    if (gu.from_progress_marker(i).token() != token) {
-      sync_pb::DataTypeProgressMarker* new_marker =
-          response->mutable_get_updates()->add_new_progress_marker();
-      new_marker->set_data_type_id(gu.from_progress_marker(i).data_type_id());
-      new_marker->set_token(token);
-    }
+    sync_pb::DataTypeProgressMarker* new_marker =
+        response->mutable_get_updates()->add_new_progress_marker();
+    new_marker->set_data_type_id(gu.from_progress_marker(i).data_type_id());
+    new_marker->set_token(token);
   }
 
   // Fill the keystore key if requested.
   if (gu.need_encryption_key())
     response->mutable_get_updates()->add_encryption_keys(keystore_key_);
 
   update_queue_.pop_front();
 
   if (gu_client_command_) {
     response->mutable_client_command()->CopyFrom(*gu_client_command_.get());
@@ skipping 178 matching lines @@
     server_status_ = HttpResponse::SERVER_CONNECTION_OK;
   }
 }
 
 void MockConnectionManager::SetServerStatus(
     HttpResponse::ServerConnectionCode server_status) {
   server_status_ = server_status;
 }
 
 }  // namespace syncer