Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/notifier/invalidator_test_template.h

 // 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.
 
 // This class defines tests that implementations of Invalidator should pass in
 // order to be conformant.  Here's how you use it to test your implementation.
 //
 // Say your class is called MyInvalidator.  Then you need to define a class
 // called MyInvalidatorTestDelegate in my_sync_notifier_unittest.cc like this:
 //
@@ skipping 38 matching lines @@
 //     // Should cause OnInvalidatorStateChange() to be called on all
 //     // observers of the Invalidator implementation with the given
 //     // parameters.
 //     void TriggerOnInvalidatorStateChange(InvalidatorState state) {
 //       ...
 //     }
 //
 //     // Should cause OnIncomingInvalidation() to be called on all
 //     // observers of the Invalidator implementation with the given
 //     // parameters.
-//     void TriggerOnIncomingInvalidation(const ObjectIdStateMap& id_state_map,
-//                                        IncomingInvalidationSource source) {
+//     void TriggerOnIncomingInvalidation(
+//         const ObjectIdInvalidationMap& invalidation_map,
+//         IncomingInvalidationSource source) {
 //       ...
 //     }
 //
 //     // Returns whether or not the notifier handles storing the old
 //     // (deprecated) notifier state.
 //     static bool InvalidatorHandlesDeprecatedState() {
 //       return false;
 //     }
 //   };
 //
@@ skipping 12 matching lines @@
 #ifndef SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_
 #define SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/fake_invalidation_state_tracker.h"
 #include "sync/notifier/invalidator.h"
-#include "sync/notifier/object_id_state_map.h"
-#include "sync/notifier/object_id_state_map_test_util.h"
+#include "sync/notifier/object_id_invalidation_map.h"
+#include "sync/notifier/object_id_invalidation_map_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 template <typename InvalidatorTestDelegate>
 class InvalidatorTest : public testing::Test {
  protected:
   InvalidatorTest()
       : id1(ipc::invalidation::ObjectSource::TEST, "a"),
         id2(ipc::invalidation::ObjectSource::TEST, "b"),
@@ skipping 36 matching lines @@
 // handler, and then unregister the handler, dispatching invalidations in
 // between.  The handler should only see invalidations when its registered and
 // its IDs are registered.
 TYPED_TEST_P(InvalidatorTest, Basic) {
   Invalidator* const invalidator = this->CreateAndInitializeInvalidator();
 
   FakeInvalidationHandler handler;
 
   invalidator->RegisterHandler(&handler);
 
-  ObjectIdStateMap states;
+  ObjectIdInvalidationMap states;
   states[this->id1].payload = "1";
   states[this->id2].payload = "2";
   states[this->id3].payload = "3";
 
   // Should be ignored since no IDs are registered to |handler|.
   this->delegate_.TriggerOnIncomingInvalidation(states, REMOTE_INVALIDATION);
   EXPECT_EQ(0, handler.GetInvalidationCount());
 
   ObjectIdSet ids;
   ids.insert(this->id1);
   ids.insert(this->id2);
   invalidator->UpdateRegisteredIds(&handler, ids);
 
   this->delegate_.TriggerOnInvalidatorStateChange(INVALIDATIONS_ENABLED);
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler.GetInvalidatorState());
 
-  ObjectIdStateMap expected_states;
+  ObjectIdInvalidationMap expected_states;
   expected_states[this->id1].payload = "1";
   expected_states[this->id2].payload = "2";
 
   this->delegate_.TriggerOnIncomingInvalidation(states, REMOTE_INVALIDATION);
   EXPECT_EQ(1, handler.GetInvalidationCount());
-  EXPECT_THAT(
-      expected_states,
-      Eq(handler.GetLastInvalidationIdStateMap()));
+  EXPECT_THAT(expected_states, Eq(handler.GetLastInvalidationMap()));
   EXPECT_EQ(REMOTE_INVALIDATION, handler.GetLastInvalidationSource());
 
   ids.erase(this->id1);
   ids.insert(this->id3);
   invalidator->UpdateRegisteredIds(&handler, ids);
 
   expected_states.erase(this->id1);
   expected_states[this->id3].payload = "3";
 
   // Removed object IDs should not be notified, newly-added ones should.
   this->delegate_.TriggerOnIncomingInvalidation(states, REMOTE_INVALIDATION);
   EXPECT_EQ(2, handler.GetInvalidationCount());
-  EXPECT_THAT(
-      expected_states,
-      Eq(handler.GetLastInvalidationIdStateMap()));
+  EXPECT_THAT(expected_states, Eq(handler.GetLastInvalidationMap()));
   EXPECT_EQ(REMOTE_INVALIDATION, handler.GetLastInvalidationSource());
 
   this->delegate_.TriggerOnInvalidatorStateChange(TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR,
             handler.GetInvalidatorState());
 
   this->delegate_.TriggerOnInvalidatorStateChange(
       INVALIDATION_CREDENTIALS_REJECTED);
   EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED,
             handler.GetInvalidatorState());
@@ skipping 46 matching lines @@
 
   invalidator->UnregisterHandler(&handler4);
 
   this->delegate_.TriggerOnInvalidatorStateChange(INVALIDATIONS_ENABLED);
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler1.GetInvalidatorState());
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler2.GetInvalidatorState());
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler3.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler4.GetInvalidatorState());
 
   {
-    ObjectIdStateMap states;
+    ObjectIdInvalidationMap states;
     states[this->id1].payload = "1";
     states[this->id2].payload = "2";
     states[this->id3].payload = "3";
     states[this->id4].payload = "4";
     this->delegate_.TriggerOnIncomingInvalidation(states, REMOTE_INVALIDATION);
 
-    ObjectIdStateMap expected_states;
+    ObjectIdInvalidationMap expected_states;
     expected_states[this->id1].payload = "1";
     expected_states[this->id2].payload = "2";
 
     EXPECT_EQ(1, handler1.GetInvalidationCount());
-    EXPECT_THAT(
-        expected_states,
-        Eq(handler1.GetLastInvalidationIdStateMap()));
+    EXPECT_THAT(expected_states, Eq(handler1.GetLastInvalidationMap()));
     EXPECT_EQ(REMOTE_INVALIDATION, handler1.GetLastInvalidationSource());
 
     expected_states.clear();
     expected_states[this->id3].payload = "3";
 
     EXPECT_EQ(1, handler2.GetInvalidationCount());
-    EXPECT_THAT(
-        expected_states,
-        Eq(handler2.GetLastInvalidationIdStateMap()));
+    EXPECT_THAT(expected_states, Eq(handler2.GetLastInvalidationMap()));
     EXPECT_EQ(REMOTE_INVALIDATION, handler2.GetLastInvalidationSource());
 
     EXPECT_EQ(0, handler3.GetInvalidationCount());
     EXPECT_EQ(0, handler4.GetInvalidationCount());
   }
 
   this->delegate_.TriggerOnInvalidatorStateChange(TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler1.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler2.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler3.GetInvalidatorState());
@@ skipping 28 matching lines @@
 
   // Unregister the IDs for the first observer. It should not receive any
   // further invalidations.
   invalidator->UpdateRegisteredIds(&handler1, ObjectIdSet());
 
   this->delegate_.TriggerOnInvalidatorStateChange(INVALIDATIONS_ENABLED);
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler1.GetInvalidatorState());
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler2.GetInvalidatorState());
 
   {
-    ObjectIdStateMap states;
+    ObjectIdInvalidationMap states;
     states[this->id1].payload = "1";
     states[this->id2].payload = "2";
     states[this->id3].payload = "3";
     this->delegate_.TriggerOnIncomingInvalidation(states, REMOTE_INVALIDATION);
     EXPECT_EQ(0, handler1.GetInvalidationCount());
     EXPECT_EQ(1, handler2.GetInvalidationCount());
   }
 
   this->delegate_.TriggerOnInvalidatorStateChange(TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler1.GetInvalidatorState());
@@ skipping 78 matching lines @@
   EXPECT_EQ("fake_state", this->fake_tracker_.GetBootstrapData());
 }
 
 REGISTER_TYPED_TEST_CASE_P(InvalidatorTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent, MigrateState);
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_