Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/chrome_invalidation_client.h

Index: sync/notifier/chrome_invalidation_client.h
diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h
index e05808cbd11ddebcce3393c7c21ac2a01b20dcf6..fc6c43dfae70d4abe9ae647aea952e0b1c2eb887 100644
--- a/sync/notifier/chrome_invalidation_client.h
+++ b/sync/notifier/chrome_invalidation_client.h
@@ -22,7 +22,7 @@
 #include "sync/notifier/chrome_system_resources.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/notifications_disabled_reason.h"
-#include "sync/notifier/object_id_payload_map.h"
+#include "sync/notifier/object_id_state_map.h"
 #include "sync/notifier/state_writer.h"
 
 namespace buzz {
@@ -56,7 +56,7 @@ class ChromeInvalidationClient
    public:
     virtual ~Listener();
 
-    virtual void OnInvalidate(const ObjectIdPayloadMap& id_payloads) = 0;
+    virtual void OnInvalidate(const ObjectIdStateMap& id_state_map) = 0;
 
     virtual void OnNotificationsEnabled() = 0;
 
@@ -137,7 +137,7 @@ class ChromeInvalidationClient
 
   void EmitStateChange();
 
-  void EmitInvalidation(const ObjectIdPayloadMap& id_payloads);
+  void EmitInvalidation(const ObjectIdStateMap& id_state_map);
 
   // Owned by |chrome_system_resources_|.
   notifier::PushClient* const push_client_;