Revert r147801 "Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver"

This broke sync_integration_tests like it had never been run.

Note that sync_integration_tests is not on GateKeeper but redness is still sad.

TBR=dcheng@chromium.org
BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10806060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147817 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index 22b22d6..25ebcbd 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -63,10 +63,8 @@ class NotificationPrinter : public SyncNotifierObserver {
   }
 
   virtual void OnIncomingNotification(
-      const ObjectIdPayloadMap& id_payloads,
+      const ModelTypePayloadMap& type_payloads,
       IncomingNotificationSource source) OVERRIDE {
-    const ModelTypePayloadMap& type_payloads =
-        ObjectIdPayloadMapToModelTypePayloadMap(id_payloads);
     for (ModelTypePayloadMap::const_iterator it =
              type_payloads.begin(); it != type_payloads.end(); ++it) {
       LOG(INFO) << (source == REMOTE_NOTIFICATION ? "Remote" : "Local")
@@ -235,17 +233,17 @@ int SyncListenNotificationsMain(int argc, char* argv[]) {
   scoped_ptr<SyncNotifier> sync_notifier(
       sync_notifier_factory.CreateSyncNotifier());
   NotificationPrinter notification_printer;
+  sync_notifier->AddObserver(&notification_printer);
 
   const char kUniqueId[] = "fake_unique_id";
   sync_notifier->SetUniqueId(kUniqueId);
   sync_notifier->UpdateCredentials(email, token);
   // Listen for notifications for all known types.
-  sync_notifier->UpdateRegisteredIds(
-      &notification_printer, ModelTypeSetToObjectIdSet(ModelTypeSet::All()));
+  sync_notifier->UpdateEnabledTypes(ModelTypeSet::All());
 
   ui_loop.Run();
 
-  sync_notifier->UpdateRegisteredIds(&notification_printer, ObjectIdSet());
+  sync_notifier->RemoveObserver(&notification_printer);
   io_thread.Stop();
   return 0;
 }