[Sync] Rework Invalidator-related unit tests

sync/notifier/invalidator_registrar.cc

Index: sync/notifier/invalidator_registrar.cc
diff --git a/sync/notifier/invalidator_registrar.cc b/sync/notifier/invalidator_registrar.cc
index a7ac5b08768696fcc0f90715233ce122431d1d87..03b401a3505661e1bd760b77462754b9ff1a3e3f 100644
--- a/sync/notifier/invalidator_registrar.cc
+++ b/sync/notifier/invalidator_registrar.cc
@@ -63,6 +63,19 @@ void InvalidatorRegistrar::UnregisterHandler(InvalidationHandler* handler) {
   handlers_.RemoveObserver(handler);
 }
 
+ObjectIdSet InvalidatorRegistrar::GetRegisteredIds(
+    InvalidationHandler* handler) const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  ObjectIdSet registered_ids;
+  for (IdHandlerMap::const_iterator it = id_to_handler_map_.begin();
+       it != id_to_handler_map_.end(); ++it) {
+    if (it->second == handler) {
+      registered_ids.insert(it->first);
+    }
+  }
+  return registered_ids;
+}
+
 ObjectIdSet InvalidatorRegistrar::GetAllRegisteredIds() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   ObjectIdSet registered_ids;
@@ -120,19 +133,6 @@ bool InvalidatorRegistrar::IsHandlerRegisteredForTest(
   return handlers_.HasObserver(handler);
 }
 
-ObjectIdSet InvalidatorRegistrar::GetRegisteredIdsForTest(
-    InvalidationHandler* handler) const {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  ObjectIdSet registered_ids;
-  for (IdHandlerMap::const_iterator it = id_to_handler_map_.begin();
-       it != id_to_handler_map_.end(); ++it) {
-    if (it->second == handler) {
-      registered_ids.insert(it->first);
-    }
-  }
-  return registered_ids;
-}
-
 void InvalidatorRegistrar::DetachFromThreadForTest() {
   DCHECK(thread_checker_.CalledOnValidThread());
   thread_checker_.DetachFromThread();