Refactor common invalidation framework types

sync/notifier/invalidator_registrar.h

 // Copyright 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/base/sync_export.h"
 #include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/object_id_invalidation_map.h"
 
 namespace invalidation {
 class ObjectId;
 }  // namespace invalidation
 
 namespace syncer {
 
+class ObjectIdInvalidationMap;
+
 // 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
 // here to dispatch invalidations and other interesting notifications.
 class SYNC_EXPORT InvalidatorRegistrar {
  public:
   InvalidatorRegistrar();
 
   // It is an error to have registered handlers on destruction.
   ~InvalidatorRegistrar();
@@ skipping 35 matching lines @@
   // InvalidationHandler::OnInvalidatorStateChange(), this returns the
   // updated state.
   InvalidatorState GetInvalidatorState() const;
 
   bool IsHandlerRegisteredForTest(InvalidationHandler* handler) const;
 
   // Needed for death tests.
   void DetachFromThreadForTest();
 
  private:
-  typedef std::map<invalidation::ObjectId, InvalidationHandler*,
-                   ObjectIdLessThan>
-      IdHandlerMap;
-
-  InvalidationHandler* ObjectIdToHandler(const invalidation::ObjectId& id);
+  typedef std::map<InvalidationHandler*, ObjectIdSet> HandlerIdsMap;
 
   base::ThreadChecker thread_checker_;
   ObserverList<InvalidationHandler> handlers_;
-  IdHandlerMap id_to_handler_map_;
+  HandlerIdsMap handler_to_ids_map_;
   InvalidatorState state_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidatorRegistrar);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_