Rename ModelType/ObjectIdStateMap to InvalidationMap.

chrome/browser/sync/profile_sync_service_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/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 12 matching lines @@
 #include "content/public/common/content_client.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/js/js_arg_list.h"
 #include "sync/js/js_event_details.h"
 #include "sync/js/js_test_util.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidator.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/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/user_agent/user_agent.h"
 
 // TODO(akalin): Add tests here that exercise the whole
 // ProfileSyncService/SyncBackendHost stack while mocking out as
 // little as possible.
 
 namespace browser_sync {
 
@@ skipping 355 matching lines @@
 }
 
 // Register for some IDs with the ProfileSyncService, restart sync,
 // and trigger some invalidation messages.  They should still be
 // received by the handler.
 TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIdsPersistence) {
   harness_.StartSyncService();
 
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(3, "id3"));
-  const syncer::ObjectIdStateMap& states =
-      syncer::ObjectIdSetToStateMap(ids, "payload");
+  const syncer::ObjectIdInvalidationMap& states =
+      syncer::ObjectIdSetToInvalidationMap(ids, "payload");
 
   syncer::FakeInvalidationHandler handler;
 
   harness_.service->RegisterInvalidationHandler(&handler);
   harness_.service->UpdateRegisteredInvalidationIds(&handler, ids);
 
   harness_.service->StopAndSuppress();
   harness_.service->UnsuppressAndStart();
 
   SyncBackendHostForProfileSyncTest* const backend =
       harness_.service->GetBackendForTest();
 
   backend->EmitOnInvalidatorStateChange(syncer::INVALIDATIONS_ENABLED);
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler.GetInvalidatorState());
 
   backend->EmitOnIncomingInvalidation(states, syncer::REMOTE_INVALIDATION);
-  EXPECT_THAT(states, Eq(handler.GetLastInvalidationIdStateMap()));
+  EXPECT_THAT(states, Eq(handler.GetLastInvalidationMap()));
   EXPECT_EQ(syncer::REMOTE_INVALIDATION, handler.GetLastInvalidationSource());
 
   backend->EmitOnInvalidatorStateChange(syncer::TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
             handler.GetInvalidatorState());
 }
 
 // Thin Invalidator wrapper around ProfileSyncService.
 class ProfileSyncServiceInvalidator : public syncer::Invalidator {
  public:
@@ skipping 28 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 syncer::ObjectIdStateMap& id_state_map) OVERRIDE {
+      const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
     // Do nothing.
   }
 
  private:
   ProfileSyncService* const service_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceInvalidator);
 };
 
 }  // namespace
@@ skipping 31 matching lines @@
 
   void WaitForInvalidator() {
     // Do nothing.
   }
 
   void TriggerOnInvalidatorStateChange(syncer::InvalidatorState state) {
     harness_.service->GetBackendForTest()->EmitOnInvalidatorStateChange(state);
   }
 
   void TriggerOnIncomingInvalidation(
-      const syncer::ObjectIdStateMap& id_state_map,
+      const syncer::ObjectIdInvalidationMap& invalidation_map,
       syncer::IncomingInvalidationSource source) {
     harness_.service->GetBackendForTest()->EmitOnIncomingInvalidation(
-        id_state_map, source);
+        invalidation_map, source);
   }
 
   static bool InvalidatorHandlesDeprecatedState() {
     return false;
   }
 
  private:
   ProfileSyncServiceTestHarness harness_;
   scoped_ptr<ProfileSyncServiceInvalidator> invalidator_;
 };
 
 }  // namespace browser_sync
 
 namespace syncer {
 namespace {
 
 // ProfileSyncService should behave just like an invalidator.
 INSTANTIATE_TYPED_TEST_CASE_P(
     ProfileSyncServiceInvalidatorTest, InvalidatorTest,
     ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate);
 
 }  // namespace
 }  // namespace syncer