Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/notifier/invalidator_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_INVALIDATOR_REGISTRAR_H_
 #define SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/object_id_state_map.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 
 namespace invalidation {
 class ObjectId;
 }  // namespace invalidation
 
 namespace syncer {
 
 // A helper class for implementations of the Invalidator interface.  It helps
 // keep track of registered handlers and which object ID registrations are
 // associated with which handlers, so implementors can just reuse the logic
@@ skipping 21 matching lines @@
   ObjectIdSet GetRegisteredIds(InvalidationHandler* handler) const;
 
   // 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 ObjectIdStateMap& id_state_map,
-                                       IncomingInvalidationSource source);
+  void DispatchInvalidationsToHandlers(
+      const ObjectIdInvalidationMap& invalidation_map,
+      IncomingInvalidationSource source);
 
   // Updates the invalidator state to the given one and then notifies
   // all handlers.  Note that the order is important; handlers that
   // call GetInvalidatorState() when notified will see the new state.
   void UpdateInvalidatorState(InvalidatorState state);
 
   // Returns the current invalidator state.  When called from within
   // InvalidationHandler::OnInvalidatorStateChange(), this returns the
   // updated state.
   InvalidatorState GetInvalidatorState() const;
@@ skipping 14 matching lines @@
   ObserverList<InvalidationHandler> handlers_;
   IdHandlerMap id_to_handler_map_;
   InvalidatorState state_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidatorRegistrar);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_