Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/notifier/mock_sync_notifier_observer.h

Index: sync/notifier/mock_sync_notifier_observer.h
diff --git a/sync/notifier/mock_sync_notifier_observer.h b/sync/notifier/mock_sync_notifier_observer.h
index a49b66b126832a395e26189d4ffb12a1f12ffbb9..65c7958265127067c94ee689334a33cd7fbbcf23 100644
--- a/sync/notifier/mock_sync_notifier_observer.h
+++ b/sync/notifier/mock_sync_notifier_observer.h
@@ -18,11 +18,11 @@ class MockSyncNotifierObserver : public SyncNotifierObserver {
   MockSyncNotifierObserver();
   virtual ~MockSyncNotifierObserver();
 
+  MOCK_METHOD0(GetHandledIds, ObjectIdSet());
   MOCK_METHOD0(OnNotificationsEnabled, void());
   MOCK_METHOD1(OnNotificationsDisabled, void(NotificationsDisabledReason));
   MOCK_METHOD2(OnIncomingNotification,
-               void(const syncer::ModelTypePayloadMap&,
-                    IncomingNotificationSource));
+               void(const ObjectIdPayloadMap&, IncomingNotificationSource));
 };
 
 }  // namespace syncer