Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

chrome/browser/chrome_to_mobile_service.cc

Index: chrome/browser/chrome_to_mobile_service.cc
diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc
index 34afa32f246c0e47cdf43aff2b635e0c64a2ea4f..70ce346f96d51806cd2601a94d70e86b6f235a05 100644
--- a/chrome/browser/chrome_to_mobile_service.cc
+++ b/chrome/browser/chrome_to_mobile_service.cc
@@ -376,12 +376,12 @@ void ChromeToMobileService::OnNotificationsDisabled(
 }
 
 void ChromeToMobileService::OnIncomingNotification(
-    const syncer::ObjectIdPayloadMap& id_payloads,
+    const syncer::ObjectIdStateMap& id_state_map,
     syncer::IncomingNotificationSource source) {
-  DCHECK_EQ(id_payloads.size(), 1U);
-  DCHECK_EQ(id_payloads.count(invalidation::ObjectId(
+  DCHECK_EQ(1U, id_state_map.size());
+  DCHECK_EQ(1U, id_state_map.count(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
-      kSyncInvalidationObjectIdChromeToMobileDeviceList)), 1U);
+      kSyncInvalidationObjectIdChromeToMobileDeviceList)));
   RequestDeviceSearch();
 }