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

Side by Side Diff: remoting/jingle_glue/jingle_thread_unittest.cc

Issue 9572038: Convert uses of int ms to TimeDelta in jingle and remoting. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix nits. Created 8 years, 9 months 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 unified diff | Download patch
« no previous file with comments | « remoting/jingle_glue/iq_sender.cc ('k') | remoting/protocol/connection_tester.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/time.h" 8 #include "base/time.h"
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "remoting/jingle_glue/jingle_thread.h" 10 #include "remoting/jingle_glue/jingle_thread.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 TEST(JingleThreadTest, PostDelayedTask) { 56 TEST(JingleThreadTest, PostDelayedTask) {
57 JingleThread thread; 57 JingleThread thread;
58 MockCallback task; 58 MockCallback task;
59 base::WaitableEvent event(true, false); 59 base::WaitableEvent event(true, false);
60 EXPECT_CALL(task, Run()).WillOnce(SignalEvent(&event)); 60 EXPECT_CALL(task, Run()).WillOnce(SignalEvent(&event));
61 61
62 thread.Start(); 62 thread.Start();
63 base::Time start = base::Time::Now(); 63 base::Time start = base::Time::Now();
64 thread.message_loop()->PostDelayedTask( 64 thread.message_loop()->PostDelayedTask(
65 FROM_HERE, base::Bind(&MockCallback::Run, base::Unretained(&task)), 65 FROM_HERE, base::Bind(&MockCallback::Run, base::Unretained(&task)),
66 kDelayMs); 66 base::TimeDelta::FromMilliseconds(kDelayMs));
67 event.TimedWait(base::TimeDelta::FromMilliseconds(kDelayTimeoutMs)); 67 event.TimedWait(base::TimeDelta::FromMilliseconds(kDelayTimeoutMs));
68 base::Time end = base::Time::Now(); 68 base::Time end = base::Time::Now();
69 thread.Stop(); 69 thread.Stop();
70 70
71 EXPECT_GE((end - start).InMillisecondsRoundedUp(), kDelayMs); 71 EXPECT_GE((end - start).InMillisecondsRoundedUp(), kDelayMs);
72 } 72 }
73 73
74 TEST(JingleThreadTest, PostNonNestableDelayedTask) { 74 TEST(JingleThreadTest, PostNonNestableDelayedTask) {
75 JingleThread thread; 75 JingleThread thread;
76 MockCallback task; 76 MockCallback task;
77 base::WaitableEvent event(true, false); 77 base::WaitableEvent event(true, false);
78 EXPECT_CALL(task, Run()).WillOnce(SignalEvent(&event)); 78 EXPECT_CALL(task, Run()).WillOnce(SignalEvent(&event));
79 79
80 thread.Start(); 80 thread.Start();
81 base::Time start = base::Time::Now(); 81 base::Time start = base::Time::Now();
82 thread.message_loop()->PostNonNestableDelayedTask( 82 thread.message_loop()->PostNonNestableDelayedTask(
83 FROM_HERE, base::Bind(&MockCallback::Run, base::Unretained(&task)), 83 FROM_HERE, base::Bind(&MockCallback::Run, base::Unretained(&task)),
84 kDelayMs); 84 base::TimeDelta::FromMilliseconds(kDelayMs));
85 event.TimedWait(base::TimeDelta::FromMilliseconds(kDelayTimeoutMs)); 85 event.TimedWait(base::TimeDelta::FromMilliseconds(kDelayTimeoutMs));
86 base::Time end = base::Time::Now(); 86 base::Time end = base::Time::Now();
87 thread.Stop(); 87 thread.Stop();
88 88
89 EXPECT_GE((end - start).InMillisecondsRoundedUp(), kDelayMs); 89 EXPECT_GE((end - start).InMillisecondsRoundedUp(), kDelayMs);
90 } 90 }
91 91
92 } // namespace remoting 92 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/jingle_glue/iq_sender.cc ('k') | remoting/protocol/connection_tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698