Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/engine/sync_scheduler_whitebox_unittest.cc

 // Copyright (c) 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.
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "sync/engine/backoff_delay_provider.h"
 #include "sync/engine/sync_scheduler_impl.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/internal_api/public/engine/polling_constants.h"
@@ skipping 125 matching lines @@
 
   SyncSchedulerImpl::JobProcessDecision decision =
       CreateAndDecideJob(SyncSchedulerImpl::SyncSessionJob::NUDGE);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::SAVE);
 }
 
 TEST_F(SyncSchedulerWhiteboxTest, SaveNudgeWhileTypeThrottled) {
   InitializeSyncerOnNormalMode();
 
-  ModelTypeSet types;
-  types.Put(BOOKMARKS);
+  const ModelTypeSet types(BOOKMARKS);
 
   // Mark bookmarks as throttled.
   context()->throttled_data_type_tracker()->SetUnthrottleTime(
       types, base::TimeTicks::Now() + base::TimeDelta::FromHours(2));
 
-  ModelTypeStateMap type_state_map;
-  type_state_map.insert(std::make_pair(BOOKMARKS, InvalidationState()));
+  const ModelTypeInvalidationMap& invalidation_map =
+      ModelTypeSetToInvalidationMap(types, std::string());
 
-  SyncSourceInfo info(GetUpdatesCallerInfo::LOCAL, type_state_map);
+  SyncSourceInfo info(GetUpdatesCallerInfo::LOCAL, invalidation_map);
   SyncSession* s = scheduler_->CreateSyncSession(info);
 
   // Now schedule a nudge with just bookmarks and the change is local.
   SyncSchedulerImpl::SyncSessionJob job(
         SyncSchedulerImpl::SyncSessionJob::NUDGE,
         TimeTicks::Now(),
         make_linked_ptr(s),
         false,
         ConfigurationParams(),
         FROM_HERE);
@@ skipping 95 matching lines @@
   struct SyncSchedulerImpl::SyncSessionJob job;
   job.purpose = SyncSchedulerImpl::SyncSessionJob::CONFIGURATION;
   job.scheduled_start = TimeTicks::Now();
   job.is_canary_job = true;
   SyncSchedulerImpl::JobProcessDecision decision = DecideOnJob(job);
 
   EXPECT_EQ(decision, SyncSchedulerImpl::CONTINUE);
 }
 
 }  // namespace syncer