From a54a51fdcee61c0b04f7b9cc7ccad296cf3b23a9 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Sun, 22 Jul 2012 11:56:41 +0000 Subject: 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 --- sync/tools/sync_listen_notifications.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'sync/tools') 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 sync_notifier( sync_notifier_factory.CreateSyncNotifier()); NotificationPrinter notification_printer; + sync_notifier->AddObserver(¬ification_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( - ¬ification_printer, ModelTypeSetToObjectIdSet(ModelTypeSet::All())); + sync_notifier->UpdateEnabledTypes(ModelTypeSet::All()); ui_loop.Run(); - sync_notifier->UpdateRegisteredIds(¬ification_printer, ObjectIdSet()); + sync_notifier->RemoveObserver(¬ification_printer); io_thread.Stop(); return 0; } -- cgit v1.1