[Sync] Rework Invalidator-related unit tests

sync/notifier/invalidator_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/invalidator_registrar.h"
 
 #include <cstddef>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 45 matching lines @@
   }
 }
 
 void InvalidatorRegistrar::UnregisterHandler(InvalidationHandler* handler) {
   DCHECK(thread_checker_.CalledOnValidThread());
   CHECK(handler);
   CHECK(handlers_.HasObserver(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);

[Nicolas Zea, 2012/08/29 23:41:05]

break after?

[akalin, 2012/08/30 22:20:38]

no, it has to find all registered IDs

+    }
+  }
+  return registered_ids;
+}
+
 ObjectIdSet InvalidatorRegistrar::GetAllRegisteredIds() 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) {
     registered_ids.insert(it->first);
   }
   return registered_ids;
 }
 
@@ skipping 37 matching lines @@
   FOR_EACH_OBSERVER(InvalidationHandler, handlers_,
                     OnNotificationsDisabled(reason));
 }
 
 bool InvalidatorRegistrar::IsHandlerRegisteredForTest(
     InvalidationHandler* handler) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   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();
 }
 
 InvalidationHandler* InvalidatorRegistrar::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