Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/sync_notifier_registrar.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 "sync/notifier/sync_notifier_registrar.h"
 
 #include <cstddef>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 56 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   ObjectIdSet registered_ids;
   for (IdHandlerMap::const_iterator it = id_to_handler_map_.begin();
        it != id_to_handler_map_.end(); ++it) {
     registered_ids.insert(it->first);
   }
   return registered_ids;
 }
 
 void SyncNotifierRegistrar::DispatchInvalidationsToHandlers(
-    const ObjectIdPayloadMap& id_payloads,
+    const ObjectIdStateMap& id_state_map,
     IncomingNotificationSource source) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // If we have no handlers, there's nothing to do.
   if (!handlers_.might_have_observers()) {
     return;
   }
 
-  typedef std::map<SyncNotifierObserver*, ObjectIdPayloadMap> DispatchMap;
+  typedef std::map<SyncNotifierObserver*, ObjectIdStateMap> DispatchMap;
   DispatchMap dispatch_map;
-  for (ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
-       it != id_payloads.end(); ++it) {
+  for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
+       it != id_state_map.end(); ++it) {
     SyncNotifierObserver* const handler = ObjectIdToHandler(it->first);
     // Filter out invalidations for IDs with no handler.
     if (handler)
       dispatch_map[handler].insert(*it);
   }
 
   // Emit invalidations only for handlers in |handlers_|.
   ObserverListBase<SyncNotifierObserver>::Iterator it(handlers_);
   SyncNotifierObserver* handler = NULL;
   while ((handler = it.GetNext()) != NULL) {
@@ skipping 21 matching lines @@
 }
 
 SyncNotifierObserver* SyncNotifierRegistrar::ObjectIdToHandler(
     const invalidation::ObjectId& id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   IdHandlerMap::const_iterator it = id_to_handler_map_.find(id);
   return (it == id_to_handler_map_.end()) ? NULL : it->second;
 }
 
 }  // namespace syncer