[Sync] Rework Invalidator-related unit tests

chrome/browser/sync/glue/chrome_sync_notification_bridge.h

Index: chrome/browser/sync/glue/chrome_sync_notification_bridge.h
diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge.h b/chrome/browser/sync/glue/chrome_sync_notification_bridge.h
index 5d85bec5fb9cf4cea157f6b51412fb7ce15434bc..788303e7e538ee7d9a0dbf362cf7258d2343edc6 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge.h
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge.h
@@ -10,7 +10,6 @@
 #include "base/sequenced_task_runner.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/invalidation_util.h"
 
 class Profile;
@@ -42,12 +41,15 @@ class ChromeSyncNotificationBridge : public content::NotificationObserver {
   void StopForShutdown();
 
   // Must be called on the sync task runner.
-  void UpdateEnabledTypes(syncer::ModelTypeSet enabled_types);
-  // Marked virtual for tests.
-  virtual void RegisterHandler(syncer::InvalidationHandler* handler);
-  virtual void UpdateRegisteredIds(syncer::InvalidationHandler* handler,
-                                   const syncer::ObjectIdSet& ids);
-  virtual void UnregisterHandler(syncer::InvalidationHandler* handler);
+  void RegisterHandler(syncer::InvalidationHandler* handler);
+  void UpdateRegisteredIds(syncer::InvalidationHandler* handler,
+                           const syncer::ObjectIdSet& ids);
+  void UnregisterHandler(syncer::InvalidationHandler* handler);
+
+  bool IsHandlerRegisteredForTest(
+      syncer::InvalidationHandler* handler) const;
+  syncer::ObjectIdSet GetRegisteredIdsForTest(
+      syncer::InvalidationHandler* handler) const;
 
   // NotificationObserver implementation. Called on UI thread.
   virtual void Observe(int type,