Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(929)

Unified Diff: remoting/jingle_glue/jingle_thread_unittest.cc

Issue 6003003: Fix crash in JingleThread caused by non-nestable tasks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/sync
Patch Set: - Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/jingle_glue/jingle_thread.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/jingle_glue/jingle_thread_unittest.cc
diff --git a/remoting/jingle_glue/jingle_thread_unittest.cc b/remoting/jingle_glue/jingle_thread_unittest.cc
index bbaad799ee0aec4a4d842fe6eca7e8d7b60b2f5e..e1447275f10995ad45c5ae899c852551bea54151 100644
--- a/remoting/jingle_glue/jingle_thread_unittest.cc
+++ b/remoting/jingle_glue/jingle_thread_unittest.cc
@@ -33,6 +33,16 @@ TEST(JingleThreadTest, PostTask) {
thread.Stop();
}
+TEST(JingleThreadTest, PostNonNestableTask) {
+ JingleThread thread;
+ MockTask* task = new MockTask();
+ EXPECT_CALL(*task, Run());
+
+ thread.Start();
+ thread.message_loop()->PostNonNestableTask(FROM_HERE, task);
+ thread.Stop();
+}
+
ACTION_P(SignalEvent, event) {
event->Signal();
}
@@ -53,4 +63,20 @@ TEST(JingleThreadTest, PostDelayedTask) {
EXPECT_GE((end - start).InMillisecondsRoundedUp(), kDelayMs);
}
+TEST(JingleThreadTest, PostNonNestableDelayedTask) {
+ JingleThread thread;
+ MockTask* task = new MockTask();
+ base::WaitableEvent event(true, false);
+ EXPECT_CALL(*task, Run()).WillOnce(SignalEvent(&event));
+
+ thread.Start();
+ base::Time start = base::Time::Now();
+ thread.message_loop()->PostNonNestableDelayedTask(FROM_HERE, task, kDelayMs);
+ event.TimedWait(base::TimeDelta::FromMilliseconds(kDelayTimeoutMs));
+ base::Time end = base::Time::Now();
+ thread.Stop();
+
+ EXPECT_GE((end - start).InMillisecondsRoundedUp(), kDelayMs);
+}
+
} // namespace remoting
« no previous file with comments | « remoting/jingle_glue/jingle_thread.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698