[Sync] USS: Remove pending updates from SharedModelTypeProcessor.

We are planning to handle these in the worker in a future update.

BUG=529498

Review URL: https://codereview.chromium.org/1725573002

Cr-Commit-Position: refs/heads/master@{#377673}

2 files changed, 6 insertions, 20 deletions

diff --git a/sync/test/engine/mock_model_type_processor.cc b/sync/test/engine/mock_model_type_processor.cc
index daf9a7e..3294a5e 100644
--- a/sync/test/engine/mock_model_type_processor.cc
+++ b/sync/test/engine/mock_model_type_processor.cc
@@ -37,13 +37,11 @@ void MockModelTypeProcessor::OnCommitCompleted(
 
 void MockModelTypeProcessor::OnUpdateReceived(
     const sync_pb::DataTypeState& type_state,
-    const UpdateResponseDataList& response_list,
-    const UpdateResponseDataList& pending_updates) {
+    const UpdateResponseDataList& response_list) {
   base::Closure task = base::Bind(&MockModelTypeProcessor::OnUpdateReceivedImpl,
                                   base::Unretained(this),
                                   type_state,
-                                  response_list,
-                                  pending_updates);
+                                  response_list);
   pending_tasks_.push_back(task);
   if (is_synchronous_)
     RunQueuedTasks();
@@ -129,12 +127,6 @@ UpdateResponseDataList MockModelTypeProcessor::GetNthUpdateResponse(
   return received_update_responses_[n];
 }
 
-UpdateResponseDataList MockModelTypeProcessor::GetNthPendingUpdates(
-    size_t n) const {
-  DCHECK_LT(n, GetNumUpdateResponses());
-  return received_pending_updates_[n];
-}
-
 sync_pb::DataTypeState
 MockModelTypeProcessor::GetNthTypeStateReceivedInUpdateResponse(
     size_t n) const {
@@ -206,10 +198,8 @@ void MockModelTypeProcessor::OnCommitCompletedImpl(
 
 void MockModelTypeProcessor::OnUpdateReceivedImpl(
     const sync_pb::DataTypeState& type_state,
-    const UpdateResponseDataList& response_list,
-    const UpdateResponseDataList& pending_updates) {
+    const UpdateResponseDataList& response_list) {
   received_update_responses_.push_back(response_list);
-  received_pending_updates_.push_back(pending_updates);
   type_states_received_on_update_.push_back(type_state);
   for (UpdateResponseDataList::const_iterator it = response_list.begin();
        it != response_list.end(); ++it) {
diff --git a/sync/test/engine/mock_model_type_processor.h b/sync/test/engine/mock_model_type_processor.h
index 58600e9..482a994 100644
--- a/sync/test/engine/mock_model_type_processor.h
+++ b/sync/test/engine/mock_model_type_processor.h
@@ -41,8 +41,7 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   void OnCommitCompleted(const sync_pb::DataTypeState& type_state,
                          const CommitResponseDataList& response_list) override;
   void OnUpdateReceived(const sync_pb::DataTypeState& type_state,
-                        const UpdateResponseDataList& response_list,
-                        const UpdateResponseDataList& pending_updates) override;
+                        const UpdateResponseDataList& response_list) override;
 
   // By default, this object behaves as if all messages are processed
   // immediately.  Sometimes it is useful to defer work until later, as might
@@ -71,13 +70,12 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   // Does not includes repsonses that are in pending tasks.
   size_t GetNumUpdateResponses() const;
   UpdateResponseDataList GetNthUpdateResponse(size_t n) const;
-  UpdateResponseDataList GetNthPendingUpdates(size_t n) const;
   sync_pb::DataTypeState GetNthTypeStateReceivedInUpdateResponse(
       size_t n) const;
 
   // Getters to access the log of received commit responses.
   //
-  // Does not includes repsonses that are in pending tasks.
+  // Does not includes responses that are in pending tasks.
   size_t GetNumCommitResponses() const;
   CommitResponseDataList GetNthCommitResponse(size_t n) const;
   sync_pb::DataTypeState GetNthTypeStateReceivedInCommitResponse(
@@ -102,8 +100,7 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   //
   // Implemented as an Impl method so we can defer its execution in some cases.
   void OnUpdateReceivedImpl(const sync_pb::DataTypeState& type_state,
-                            const UpdateResponseDataList& response_list,
-                            const UpdateResponseDataList& pending_updates);
+                            const UpdateResponseDataList& response_list);
 
   // Getter and setter for per-item sequence number tracking.
   int64_t GetCurrentSequenceNumber(const std::string& tag_hash) const;
@@ -127,7 +124,6 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   // A log of messages received by this object.
   std::vector<CommitResponseDataList> received_commit_responses_;
   std::vector<UpdateResponseDataList> received_update_responses_;
-  std::vector<UpdateResponseDataList> received_pending_updates_;
   std::vector<sync_pb::DataTypeState> type_states_received_on_update_;
   std::vector<sync_pb::DataTypeState> type_states_received_on_commit_;