Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

chrome/browser/chrome_to_mobile_service.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/chrome_to_mobile_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/guid.h"
@@ skipping 358 matching lines @@
   UpdateCommandState();
 }
 
 void ChromeToMobileService::OnNotificationsDisabled(
     syncer::NotificationsDisabledReason reason) {
   sync_invalidation_enabled_ = false;
   UpdateCommandState();
 }
 
 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();
 }
 
 const std::string& ChromeToMobileService::GetAccessTokenForTest() const {
   return access_token_;
 }
 
 void ChromeToMobileService::SetAccessTokenForTest(
     const std::string& access_token) {
   access_token_ = access_token;
@@ skipping 204 matching lines @@
 
       // Ensure a second response is not sent after reporting failure below.
       request_observer_map_.erase(other);
       break;
     }
   }
 
   LogMetric(success ? SEND_SUCCESS : SEND_ERROR);
   observer->OnSendComplete(success);
 }