Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/common/content_client.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google/cacheinvalidation/include/types.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/mock_sync_notifier_observer.h"
+#include "sync/notifier/object_id_state_map_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
 
 // TODO(akalin): Add tests here that exercise the whole
 // ProfileSyncService/SyncBackendHost stack while mocking out as
 // little as possible.
 
 namespace browser_sync {
 
@@ skipping 333 matching lines @@
 // Register for some IDs with the ProfileSyncService and trigger some
 // invalidation messages.  They should be received by the observer.
 // Then unregister and trigger the invalidation messages again.  Those
 // shouldn't be received by the observer.
 TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIds) {
   StartSyncService();
 
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(1, "id1"));
   ids.insert(invalidation::ObjectId(2, "id2"));
-  const syncer::ObjectIdPayloadMap& payloads =
-      syncer::ObjectIdSetToPayloadMap(ids, "payload");
+  const syncer::ObjectIdStateMap& states =
+      syncer::ObjectIdSetToStateMap(ids, "payload");
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer, OnNotificationsEnabled());
   EXPECT_CALL(observer, OnIncomingNotification(
-      payloads, syncer::REMOTE_NOTIFICATION));
+      states, syncer::REMOTE_NOTIFICATION));
   EXPECT_CALL(observer, OnNotificationsDisabled(
       syncer::TRANSIENT_NOTIFICATION_ERROR));
 
   service_->RegisterInvalidationHandler(&observer);
   service_->UpdateRegisteredInvalidationIds(&observer, ids);
 
   SyncBackendHostForProfileSyncTest* const backend =
       service_->GetBackendForTest();
 
   backend->EmitOnNotificationsEnabled();
-  backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
+  backend->EmitOnIncomingNotification(states, syncer::REMOTE_NOTIFICATION);
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
 
   Mock::VerifyAndClearExpectations(&observer);
 
   service_->UnregisterInvalidationHandler(&observer);
 
   backend->EmitOnNotificationsEnabled();
-  backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
+  backend->EmitOnIncomingNotification(states, syncer::REMOTE_NOTIFICATION);
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
 }
 
 // Register for some IDs with the ProfileSyncService, restart sync,
 // and trigger some invalidation messages.  They should still be
 // received by the observer.
 TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIdsPersistence) {
   StartSyncService();
 
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(3, "id3"));
-  const syncer::ObjectIdPayloadMap& payloads =
-      syncer::ObjectIdSetToPayloadMap(ids, "payload");
+  const syncer::ObjectIdStateMap& states =
+      syncer::ObjectIdSetToStateMap(ids, "payload");
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer, OnNotificationsEnabled());
   EXPECT_CALL(observer, OnIncomingNotification(
-      payloads, syncer::REMOTE_NOTIFICATION));
+      states, syncer::REMOTE_NOTIFICATION));
   // This may get called more than once, as a real notifier is
   // created.
   EXPECT_CALL(observer, OnNotificationsDisabled(
       syncer::TRANSIENT_NOTIFICATION_ERROR)).Times(AtLeast(1));
 
   service_->RegisterInvalidationHandler(&observer);
   service_->UpdateRegisteredInvalidationIds(&observer, ids);
 
   service_->StopAndSuppress();
   service_->UnsuppressAndStart();
 
   SyncBackendHostForProfileSyncTest* const backend =
       service_->GetBackendForTest();
 
   backend->EmitOnNotificationsEnabled();
-  backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
+  backend->EmitOnIncomingNotification(states, syncer::REMOTE_NOTIFICATION);
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
 }
 
 }  // namespace
 }  // namespace browser_sync