Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/notifier/non_blocking_invalidation_notifier_unittest.cc

Index: sync/notifier/non_blocking_invalidation_notifier_unittest.cc
diff --git a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
index bd8ccebbb52c713578295355bc61952fb9c0a4a4..4d472009859ff02bf916d53eb067a7a01a801a32 100644
--- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
+++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
@@ -23,6 +23,7 @@ namespace syncer {
 namespace {
 
 using ::testing::InSequence;
+using ::testing::Return;
 using ::testing::StrictMock;
 
 class NonBlockingInvalidationNotifierTest : public testing::Test {
@@ -46,11 +47,11 @@ class NonBlockingInvalidationNotifierTest : public testing::Test {
             syncer::MakeWeakHandle(
                 base::WeakPtr<syncer::InvalidationStateTracker>()),
             "fake_client_info"));
-    invalidation_notifier_->AddObserver(&mock_observer_);
+    invalidation_notifier_->AddHandler(&mock_observer_);
   }
 
   virtual void TearDown() {
-    invalidation_notifier_->RemoveObserver(&mock_observer_);
+    invalidation_notifier_->RemoveHandler(&mock_observer_);
     invalidation_notifier_.reset();
     request_context_getter_ = NULL;
     io_thread_.Stop();
@@ -68,15 +69,20 @@ class NonBlockingInvalidationNotifierTest : public testing::Test {
 TEST_F(NonBlockingInvalidationNotifierTest, Basic) {
   InSequence dummy;
 
-  syncer::ModelTypePayloadMap type_payloads;
-  type_payloads[syncer::PREFERENCES] = "payload";
-  type_payloads[syncer::BOOKMARKS] = "";
-  type_payloads[syncer::AUTOFILL] = "";
+  ModelTypeSet models(syncer::PREFERENCES,
+                      syncer::BOOKMARKS,
+                      syncer::AUTOFILL);
+  ModelTypePayloadMap type_payloads =
+      ModelTypePayloadMapFromEnumSet(models, "payload");
+
+  EXPECT_CALL(mock_observer_, GetHandledIds())
+      .WillOnce(Return(ModelTypeSetToObjectIdSet(models)));
+  invalidation_notifier_->ReloadHandlers();
 
   EXPECT_CALL(mock_observer_, OnNotificationsEnabled());
-  EXPECT_CALL(mock_observer_,
-              OnIncomingNotification(type_payloads,
-                                     REMOTE_NOTIFICATION));
+  EXPECT_CALL(mock_observer_, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(type_payloads),
+      REMOTE_NOTIFICATION));
   EXPECT_CALL(mock_observer_,
               OnNotificationsDisabled(TRANSIENT_NOTIFICATION_ERROR));
   EXPECT_CALL(mock_observer_,
@@ -87,8 +93,9 @@ TEST_F(NonBlockingInvalidationNotifierTest, Basic) {
   invalidation_notifier_->UpdateCredentials("foo@bar.com", "fake_token");
 
   invalidation_notifier_->OnNotificationsEnabled();
-  invalidation_notifier_->OnIncomingNotification(type_payloads,
-                                                 REMOTE_NOTIFICATION);
+  invalidation_notifier_->OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(type_payloads),
+      REMOTE_NOTIFICATION);
   invalidation_notifier_->OnNotificationsDisabled(
       TRANSIENT_NOTIFICATION_ERROR);
   invalidation_notifier_->OnNotificationsDisabled(