diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 19:20:22 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 19:20:22 +0000 |
| commit | 88678cc8a0fb86aeaa72cf8a0d96b2caab066f55 (patch) | |
| tree | e58d38e7d8c76ad01da39eed7f40c4bec960148d /jingle/jingle.gyp | |
| parent | 28518ef23373bd3f3ccdc469e56e5cfd6b0dec98 (diff) | |
| download | chromium_src-88678cc8a0fb86aeaa72cf8a0d96b2caab066f55.zip chromium_src-88678cc8a0fb86aeaa72cf8a0d96b2caab066f55.tar.gz chromium_src-88678cc8a0fb86aeaa72cf8a0d96b2caab066f55.tar.bz2 | |
[Sync] Fix race condition in P2PNotifier with sending notifications
Store any notifications sent when not connected and send them on
the next connect.
This fixes a race condition in the sync integration tests exposed
by the new syncer thread.
Make sending of notifications not be blocked on successful subscription.
Disable a failing test in jingle_unittests.
BUG=
TEST=
Review URL: http://codereview.chromium.org/6881042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/jingle.gyp')
| -rw-r--r-- | jingle/jingle.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index aa5a720..fc600f5 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -80,6 +80,7 @@ 'notifier/listener/mediator_thread_impl.h', 'notifier/listener/notification_constants.cc', 'notifier/listener/notification_constants.h', + 'notifier/listener/notification_defines.cc', 'notifier/listener/notification_defines.h', 'notifier/listener/push_notifications_listen_task.cc', 'notifier/listener/push_notifications_listen_task.h', @@ -158,6 +159,7 @@ 'notifier/communicator/xmpp_connection_generator_unittest.cc', 'notifier/listener/mediator_thread_mock.cc', 'notifier/listener/mediator_thread_mock.h', + 'notifier/listener/mediator_thread_unittest.cc', 'notifier/listener/push_notifications_send_update_task_unittest.cc', 'notifier/listener/push_notifications_subscribe_task_unittest.cc', 'notifier/listener/talk_mediator_unittest.cc', |