Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/notifier/invalidator_registrar_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/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidator_registrar.h"
 #include "sync/notifier/invalidator_test_template.h"
-#include "sync/notifier/object_id_state_map_test_util.h"
+#include "sync/notifier/object_id_invalidation_map_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 // We test InvalidatorRegistrar by wrapping it in an Invalidator and
 // running the usual Invalidator tests.
 
 // Thin Invalidator wrapper around InvalidatorRegistrar.
@@ skipping 30 matching lines @@
 
   virtual void SetStateDeprecated(const std::string& state) OVERRIDE {
     // Do nothing.
   }
 
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE {
     // Do nothing.
   }
 
-  virtual void SendInvalidation(const ObjectIdStateMap& id_state_map) OVERRIDE {
+  virtual void SendInvalidation(
+      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
     // Do nothing.
   }
 
  private:
   InvalidatorRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrarInvalidator);
 };
 
 class RegistrarInvalidatorTestDelegate {
@@ skipping 21 matching lines @@
   }
 
   void WaitForInvalidator() {
     // Do nothing.
   }
 
   void TriggerOnInvalidatorStateChange(InvalidatorState state) {
     invalidator_->GetRegistrar()->UpdateInvalidatorState(state);
   }
 
-  void TriggerOnIncomingInvalidation(const ObjectIdStateMap& id_state_map,
-                                     IncomingInvalidationSource source) {
+  void TriggerOnIncomingInvalidation(
+      const ObjectIdInvalidationMap& invalidation_map,
+      IncomingInvalidationSource source) {
     invalidator_->GetRegistrar()->DispatchInvalidationsToHandlers(
-        id_state_map, source);
+        invalidation_map, source);
   }
 
   static bool InvalidatorHandlesDeprecatedState() {
     return false;
   }
 
  private:
   scoped_ptr<RegistrarInvalidator> invalidator_;
 };
 
@@ skipping 27 matching lines @@
 
   registrar.DetachFromThreadForTest();
   // We expect a death via CHECK(). We can't match against the CHECK() message
   // though since they are removed in official builds.
   EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, "");
 }
 
 }  // namespace
 
 }  // namespace syncer