sync: Remove ModelTypeInvalidationMap

sync/engine/download_unittest.cc

 // Copyright 2013 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 "sync/engine/download.h"
+#include "sync/internal_api/public/base/model_type_test_util.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/nudge_tracker.h"
 #include "sync/test/engine/fake_model_worker.h"
 #include "sync/test/engine/syncer_command_test.h"
 
 namespace syncer {
 
 // A test fixture for tests exercising download updates functions.
 class DownloadUpdatesTest : public SyncerCommandTest {
  protected:
@@ skipping 55 matching lines @@
       EXPECT_FALSE(progress_marker.has_notification_hint());
       EXPECT_EQ(0, gu_trigger.local_modification_nudges());
       EXPECT_EQ(0, gu_trigger.datatype_refresh_nudges());
     }
   }
 }
 
 TEST_F(DownloadUpdatesTest, ExecuteWithStates) {
   sessions::NudgeTracker nudge_tracker;
   nudge_tracker.RecordRemoteInvalidation(
-      ModelTypeSetToInvalidationMap(ModelTypeSet(AUTOFILL),
-                                    "autofill_payload"));
+      BuildInvalidationMap(AUTOFILL, 1, "autofill_payload"));
   nudge_tracker.RecordRemoteInvalidation(
-      ModelTypeSetToInvalidationMap(ModelTypeSet(BOOKMARKS),
-                                    "bookmark_payload"));
+      BuildInvalidationMap(BOOKMARKS, 1, "bookmark_payload"));
   nudge_tracker.RecordRemoteInvalidation(
-      ModelTypeSetToInvalidationMap(ModelTypeSet(PREFERENCES),
-                                    "preferences_payload"));
+      BuildInvalidationMap(PREFERENCES, 1, "preferences_payload"));
   ModelTypeSet notified_types;
   notified_types.Put(AUTOFILL);
   notified_types.Put(BOOKMARKS);
   notified_types.Put(PREFERENCES);
 
   scoped_ptr<sessions::SyncSession> session(
       sessions::SyncSession::Build(context(), delegate()));
   sync_pb::ClientToServerMessage msg;
   BuildNormalDownloadUpdates(session.get(),
                              false,
@@ skipping 60 matching lines @@
   sync_pb::ClientToServerMessage msg3;
   BuildNormalDownloadUpdates(session2.get(),
                              false,
                              GetRoutingInfoTypes(routing_info()),
                              nudge_tracker,
                              &msg3);
   EXPECT_EQ(0, msg3.debug_info().events_size());
 }
 
 }  // namespace syncer