diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-22 11:56:41 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-22 11:56:41 +0000 |
| commit | a54a51fdcee61c0b04f7b9cc7ccad296cf3b23a9 (patch) | |
| tree | 9dfdb313cc2433a8406752103282add87a135f9e /sync/sync.gyp | |
| parent | 8b77800e991ef7880b9afeff81018fe82d57e2ca (diff) | |
| download | chromium_src-a54a51fdcee61c0b04f7b9cc7ccad296cf3b23a9.zip chromium_src-a54a51fdcee61c0b04f7b9cc7ccad296cf3b23a9.tar.gz chromium_src-a54a51fdcee61c0b04f7b9cc7ccad296cf3b23a9.tar.bz2 | |
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
Diffstat (limited to 'sync/sync.gyp')
| -rw-r--r-- | sync/sync.gyp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp index 2618d21..40f5817 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -249,15 +249,11 @@ 'sources': [ 'notifier/invalidation_util.cc', 'notifier/invalidation_util.h', - 'notifier/notifications_disabled_reason.cc', 'notifier/notifications_disabled_reason.h', - 'notifier/object_id_payload_map.cc', - 'notifier/object_id_payload_map.h', + 'notifier/notifications_disabled_reason.cc', 'notifier/sync_notifier.h', - 'notifier/sync_notifier_factory.cc', 'notifier/sync_notifier_factory.h', - 'notifier/sync_notifier_helper.cc', - 'notifier/sync_notifier_helper.h', + 'notifier/sync_notifier_factory.cc', 'notifier/sync_notifier_observer.h', ], 'conditions': [ @@ -267,13 +263,13 @@ 'notifier/chrome_invalidation_client.h', 'notifier/chrome_system_resources.cc', 'notifier/chrome_system_resources.h', - 'notifier/invalidation_notifier.cc', 'notifier/invalidation_notifier.h', + 'notifier/invalidation_notifier.cc', 'notifier/invalidation_state_tracker.h', - 'notifier/non_blocking_invalidation_notifier.cc', 'notifier/non_blocking_invalidation_notifier.h', - 'notifier/p2p_notifier.cc', + 'notifier/non_blocking_invalidation_notifier.cc', 'notifier/p2p_notifier.h', + 'notifier/p2p_notifier.cc', 'notifier/push_client_channel.cc', 'notifier/push_client_channel.h', 'notifier/registration_manager.cc', @@ -652,7 +648,6 @@ 'notifier/p2p_notifier_unittest.cc', 'notifier/push_client_channel_unittest.cc', 'notifier/registration_manager_unittest.cc', - 'notifier/sync_notifier_helper_unittest.cc', ], }], ], |