Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/sync_notifier_registrar.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.
 
 #ifndef SYNC_NOTIFIER_SYNC_NOTIFIER_REGISTRAR_H_
 #define SYNC_NOTIFIER_SYNC_NOTIFIER_REGISTRAR_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/object_id_payload_map.h"
+#include "sync/notifier/object_id_state_map.h"
 #include "sync/notifier/sync_notifier_observer.h"
 
 namespace invalidation {
 class ObjectId;
 }  // namespace invalidation
 
 namespace syncer {
 
 // A helper class for implementations of the SyncNotifier interface.  It helps
 // keep track of registered handlers and which object ID registrations are
@@ skipping 21 matching lines @@
   void UnregisterHandler(SyncNotifierObserver* handler);
 
   // Returns the set of all IDs that are registered to some handler (even
   // handlers that have been unregistered).
   ObjectIdSet GetAllRegisteredIds() const;
 
   // Sorts incoming invalidations into a bucket for each handler and then
   // dispatches the batched invalidations to the corresponding handler.
   // Invalidations for IDs with no corresponding handler are dropped, as are
   // invalidations for handlers that are not added.
-  void DispatchInvalidationsToHandlers(const ObjectIdPayloadMap& id_payloads,
+  void DispatchInvalidationsToHandlers(const ObjectIdStateMap& id_state_map,
                                        IncomingNotificationSource source);
 
   // Calls the given handler method for each handler that has registered IDs.
   void EmitOnNotificationsEnabled();
   void EmitOnNotificationsDisabled(NotificationsDisabledReason reason);
 
   // Needed for death tests.
   void DetachFromThreadForTest();
 
  private:
   typedef std::map<invalidation::ObjectId, SyncNotifierObserver*,
                    ObjectIdLessThan>
       IdHandlerMap;
 
   SyncNotifierObserver* ObjectIdToHandler(const invalidation::ObjectId& id);
 
   base::ThreadChecker thread_checker_;
   ObserverList<SyncNotifierObserver> handlers_;
   IdHandlerMap id_to_handler_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncNotifierRegistrar);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_SYNC_NOTIFIER_REGISTRAR_H_