Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/sync_notifier_observer.h

Index: sync/notifier/sync_notifier_observer.h
diff --git a/sync/notifier/sync_notifier_observer.h b/sync/notifier/sync_notifier_observer.h
index b79f838f3ea78959c7546b064dacec42112068f5..1dd5ea6a098b7271c409b57ad162326a98c62394 100644
--- a/sync/notifier/sync_notifier_observer.h
+++ b/sync/notifier/sync_notifier_observer.h
@@ -5,7 +5,7 @@
 #ifndef SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
 #define SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
 
-#include "sync/notifier/object_id_payload_map.h"
+#include "sync/notifier/object_id_state_map.h"
 #include "sync/notifier/notifications_disabled_reason.h"
 
 namespace syncer {
@@ -27,10 +27,10 @@ class SyncNotifierObserver {
   virtual void OnNotificationsDisabled(
       NotificationsDisabledReason reason) = 0;
 
-  // Called when a notification is received.  The per-id payloads
-  // are in |type_payloads| and the source is in |source|.
+  // Called when a notification is received.  The per-id states
+  // are in |id_state_map| and the source is in |source|.
   virtual void OnIncomingNotification(
-      const ObjectIdPayloadMap& id_payloads,
+      const ObjectIdStateMap& id_state_map,
       IncomingNotificationSource source) = 0;
 
  protected: