Invalidation trickles mega-patch

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 474 matching lines @@
   const GetUpdatesMessage& gu = csm->get_updates();
   num_get_updates_requests_++;
   EXPECT_FALSE(gu.has_from_timestamp());
   EXPECT_FALSE(gu.has_requested_types());
 
   if (fail_non_periodic_get_updates_) {
     EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::PERIODIC,
               gu.caller_info().source());
   }
 
-  // Verify that the GetUpdates filter sent by the Syncer matches the test
-  // expectation.
-  ModelTypeSet protocol_types = ProtocolTypes();
-  for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good();
-       iter.Inc()) {
-    ModelType model_type = iter.Get();
-    sync_pb::DataTypeProgressMarker const* progress_marker =
-        GetProgressMarkerForType(gu.from_progress_marker(), model_type);
-    EXPECT_EQ(expected_filter_.Has(model_type), (progress_marker != NULL))
-        << "Syncer requested_types differs from test expectation.";
-  }
-
   // Verify that the items we're about to send back to the client are of
   // the types requested by the client.  If this fails, it probably indicates
   // a test bug.
   EXPECT_TRUE(gu.fetch_folders());
   EXPECT_FALSE(gu.has_requested_types());
   if (update_queue_.empty()) {
     GetUpdateResponse();
   }
   sync_pb::GetUpdatesResponse* updates = &update_queue_.front();
   for (int i = 0; i < updates->entries_size(); ++i) {
@@ skipping 209 matching lines @@
     server_status_ = HttpResponse::SERVER_CONNECTION_OK;
   }
 }
 
 void MockConnectionManager::SetServerStatus(
     HttpResponse::ServerConnectionCode server_status) {
   server_status_ = server_status;
 }
 
 }  // namespace syncer