diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 21:48:37 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 21:48:37 +0000 |
| commit | f285d9c29dd7428e89c34f0724fbd63d4526dc50 (patch) | |
| tree | 483ecb90f73fea0966090b95502a95f7b14af0c2 /remoting/jingle_glue | |
| parent | f9c0ecaa9af8a0b7708e563c5da495943eb000f3 (diff) | |
| download | chromium_src-f285d9c29dd7428e89c34f0724fbd63d4526dc50.zip chromium_src-f285d9c29dd7428e89c34f0724fbd63d4526dc50.tar.gz chromium_src-f285d9c29dd7428e89c34f0724fbd63d4526dc50.tar.bz2 | |
Fix flakiness in JingleChromotingConnectionTest
TEST=remoting_unittests
BUG=None
TBR=hclam
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/jingle_thread.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/jingle_glue/jingle_thread.cc b/remoting/jingle_glue/jingle_thread.cc index 450381e..e4ab098 100644 --- a/remoting/jingle_glue/jingle_thread.cc +++ b/remoting/jingle_glue/jingle_thread.cc @@ -33,6 +33,10 @@ class JingleThread::JingleMessagePump : public base::MessagePump, void OnMessage(talk_base::Message* msg) { DCHECK(msg->message_id == kRunTasksMessageId); + // Clear currently pending messages in case there were delayed tasks. + // Will schedule it again from ScheduleNextDelayedTask() if neccessary. + thread_->Clear(this, kRunTasksMessageId); + // This code is executed whenever we get new message in |message_loop_|. // JingleMessagePump posts new tasks in the jingle thread. // TODO(sergeyu): Remove it when JingleThread moved on Chromium's @@ -61,7 +65,6 @@ class JingleThread::JingleMessagePump : public base::MessagePump, void ScheduleNextDelayedTask() { DCHECK_EQ(thread_->message_loop(), MessageLoop::current()); - thread_->Clear(this, kRunTasksMessageId); if (!delayed_work_time_.is_null()) { base::Time now = base::Time::Now(); int delay = static_cast<int>((delayed_work_time_ - now).InMilliseconds()); |