Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/chrome_invalidation_client.h

 // 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.
 //
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
 #ifndef SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 #define SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "jingle/notifier/listener/push_client_observer.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #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 {
 class XmppTaskParentInterface;
 }  // namespace buzz
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
@@ skipping 13 matching lines @@
       invalidation::SystemResources*,
       int,
       const invalidation::string&,
       const invalidation::string&,
       invalidation::InvalidationListener*)> CreateInvalidationClientCallback;
 
   class Listener {
    public:
     virtual ~Listener();
 
-    virtual void OnInvalidate(const ObjectIdPayloadMap& id_payloads) = 0;
+    virtual void OnInvalidate(const ObjectIdStateMap& id_state_map) = 0;
 
     virtual void OnNotificationsEnabled() = 0;
 
     virtual void OnNotificationsDisabled(
         NotificationsDisabledReason reason) = 0;
   };
 
   explicit ChromeInvalidationClient(
       scoped_ptr<notifier::PushClient> push_client);
 
@@ skipping 60 matching lines @@
 
   void StopForTest();
 
  private:
   void Stop();
 
   NotificationsDisabledReason GetState() const;
 
   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_;
   ChromeSystemResources chrome_system_resources_;
   InvalidationVersionMap max_invalidation_versions_;
   WeakHandle<InvalidationStateTracker> invalidation_state_tracker_;
   Listener* listener_;
   scoped_ptr<invalidation::InvalidationClient> invalidation_client_;
   scoped_ptr<RegistrationManager> registration_manager_;
   // Stored to pass to |registration_manager_| on start.
   ObjectIdSet registered_ids_;
 
   // The states of the ticl and the push client (with
   // NO_NOTIFICATION_ERROR meaning notifications are enabled).
   NotificationsDisabledReason ticl_state_;
   NotificationsDisabledReason push_client_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeInvalidationClient);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_