[Sync] Rework Invalidator-related unit tests

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"
@@ skipping 26 matching lines @@
   // not be NULL, and must already be registered.  An ID must be registered for
   // at most one handler.
   void UpdateRegisteredIds(InvalidationHandler* handler,
                            const ObjectIdSet& ids);
 
   // Stops sending notifications to |handler|.  |handler| must not be NULL, and
   // it must already be registered.  Note that this doesn't unregister the IDs
   // associated with |handler|.
   void UnregisterHandler(InvalidationHandler* handler);
 
+  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,
                                        IncomingNotificationSource source);
 
   // Calls the given handler method for each handler that has registered IDs.
   void EmitOnNotificationsEnabled();
   void EmitOnNotificationsDisabled(NotificationsDisabledReason reason);
 
   bool IsHandlerRegisteredForTest(InvalidationHandler* handler) const;
-  ObjectIdSet GetRegisteredIdsForTest(InvalidationHandler* handler) const;
 
   // Needed for death tests.
   void DetachFromThreadForTest();
 
  private:
   typedef std::map<invalidation::ObjectId, InvalidationHandler*,
                    ObjectIdLessThan>
       IdHandlerMap;
 
   InvalidationHandler* ObjectIdToHandler(const invalidation::ObjectId& id);
 
   base::ThreadChecker thread_checker_;
   ObserverList<InvalidationHandler> handlers_;
   IdHandlerMap id_to_handler_map_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidatorRegistrar);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_