Rename ModelType/ObjectIdStateMap to InvalidationMap.

chrome/browser/sync/glue/bridged_invalidator_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 "chrome/browser/sync/glue/bridged_invalidator.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
 #include "chrome/test/base/profile_mock.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/model_type_test_util.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/fake_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"
 
 namespace syncer {
 class InvalidationStateTracker;
 }  // namespace syncer
 
 namespace browser_sync {
 
 // BridgedInvalidatorTestDelegate has to be visible from the syncer
@@ skipping 44 matching lines @@
 
   void WaitForInvalidator() {
     // Do nothing.
   }
 
   void TriggerOnInvalidatorStateChange(syncer::InvalidatorState state) {
     fake_delegate_->EmitOnInvalidatorStateChange(state);
   }
 
   void TriggerOnIncomingInvalidation(
-      const syncer::ObjectIdStateMap& id_state_map,
+      const syncer::ObjectIdInvalidationMap& invalidation_map,
       syncer::IncomingInvalidationSource source) {
-    fake_delegate_->EmitOnIncomingInvalidation(id_state_map, source);
+    fake_delegate_->EmitOnIncomingInvalidation(invalidation_map, source);
   }
 
   static bool InvalidatorHandlesDeprecatedState() {
     return false;
   }
 
  private:
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   ::testing::NiceMock<ProfileMock> mock_profile_;
@@ skipping 63 matching lines @@
   const std::string& token = "token";
   delegate_.GetInvalidator()->UpdateCredentials(email, token);
   EXPECT_EQ(email, delegate_.GetFakeDelegate()->GetCredentialsEmail());
   EXPECT_EQ(token, delegate_.GetFakeDelegate()->GetCredentialsToken());
 }
 
 TEST_F(BridgedInvalidatorTest, SendInvalidation) {
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(1, "id1"));
   ids.insert(invalidation::ObjectId(2, "id2"));
-  const syncer::ObjectIdStateMap& id_state_map =
-      syncer::ObjectIdSetToStateMap(ids, "payload");
-  delegate_.GetInvalidator()->SendInvalidation(id_state_map);
-  EXPECT_THAT(id_state_map,
-              Eq(delegate_.GetFakeDelegate()->GetLastSentIdStateMap()));
+  const syncer::ObjectIdInvalidationMap& invalidation_map =
+      syncer::ObjectIdSetToInvalidationMap(ids, "payload");
+  delegate_.GetInvalidator()->SendInvalidation(invalidation_map);
+  EXPECT_THAT(invalidation_map,
+              Eq(delegate_.GetFakeDelegate()->GetLastSentInvalidationMap()));
 }
 
 }  // namespace
 }  // namespace browser_sync
 
 namespace syncer {
 namespace {
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     BridgedInvalidatorTest, InvalidatorTest,
     ::browser_sync::BridgedInvalidatorTestDelegate);
 
 }  // namespace
 }  // namespace syncer