Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/internal_api/test/fake_sync_manager.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 "sync/internal_api/public/test/fake_sync_manager.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "sync/internal_api/public/internal_components_factory.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/invalidator_state.h"
-#include "sync/notifier/object_id_state_map.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 #include "sync/test/fake_sync_encryption_handler.h"
 
 namespace syncer {
 
 FakeSyncManager::FakeSyncManager(ModelTypeSet initial_sync_ended_types,
                                  ModelTypeSet progress_marker_types,
                                  ModelTypeSet configure_fail_types) :
     initial_sync_ended_types_(initial_sync_ended_types),
     progress_marker_types_(progress_marker_types),
     configure_fail_types_(configure_fail_types) {
@@ skipping 13 matching lines @@
   downloaded_types_.Clear();
   return downloaded_types;
 }
 
 ModelTypeSet FakeSyncManager::GetAndResetEnabledTypes() {
   ModelTypeSet enabled_types = enabled_types_;
   enabled_types_.Clear();
   return enabled_types;
 }
 
-void FakeSyncManager::Invalidate(const ObjectIdStateMap& id_state_map,
-                                 IncomingInvalidationSource source) {
+void FakeSyncManager::Invalidate(
+    const ObjectIdInvalidationMap& invalidation_map,
+    IncomingInvalidationSource source) {
   if (!sync_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&FakeSyncManager::InvalidateOnSyncThread,
-                 base::Unretained(this), id_state_map, source))) {
+                 base::Unretained(this), invalidation_map, source))) {
     NOTREACHED();
   }
 }
 
 void FakeSyncManager::UpdateInvalidatorState(InvalidatorState state) {
   if (!sync_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&FakeSyncManager::UpdateInvalidatorStateOnSyncThread,
                  base::Unretained(this), state))) {
     NOTREACHED();
@@ skipping 173 matching lines @@
 bool FakeSyncManager::HasUnsyncedItems() {
   NOTIMPLEMENTED();
   return false;
 }
 
 SyncEncryptionHandler* FakeSyncManager::GetEncryptionHandler() {
   return fake_encryption_handler_.get();
 }
 
 void FakeSyncManager::InvalidateOnSyncThread(
-    const ObjectIdStateMap& id_state_map,
+    const ObjectIdInvalidationMap& invalidation_map,
     IncomingInvalidationSource source) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-  registrar_.DispatchInvalidationsToHandlers(id_state_map, source);
+  registrar_.DispatchInvalidationsToHandlers(invalidation_map, source);
 }
 
 void FakeSyncManager::UpdateInvalidatorStateOnSyncThread(
     InvalidatorState state) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   registrar_.UpdateInvalidatorState(state);
 }
 
 }  // namespace syncer