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

Unified Diff: content/browser/download/byte_stream_unittest.cc

Issue 9703053: Remove old Sleep and PostDelayedTask interfaces that use int ms instead of TimeDelta. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase onto master. Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_thread_impl.cc ('k') | content/public/browser/browser_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/download/byte_stream_unittest.cc
diff --git a/content/browser/download/byte_stream_unittest.cc b/content/browser/download/byte_stream_unittest.cc
index 483641aea90ac1582f76ef49bd9bf220ace267a2..4e62f082494c7d2de6e7ea711a7543246d7fa670 100644
--- a/content/browser/download/byte_stream_unittest.cc
+++ b/content/browser/download/byte_stream_unittest.cc
@@ -33,18 +33,11 @@ class MockTaskRunner : public base::SequencedTaskRunner {
// TaskRunner functions.
MOCK_METHOD3(PostDelayedTask, bool(const tracked_objects::Location&,
- const base::Closure&, int64));
- MOCK_METHOD3(PostDelayedTask, bool(const tracked_objects::Location&,
const base::Closure&, base::TimeDelta));
MOCK_METHOD3(PostNonNestableDelayedTask, bool(
const tracked_objects::Location&,
const base::Closure&,
- int64 delay_ms));
-
- MOCK_METHOD3(PostNonNestableDelayedTask, bool(
- const tracked_objects::Location&,
- const base::Closure&,
base::TimeDelta));
MOCK_CONST_METHOD0(RunsTasksOnCurrentThread, bool());
@@ -337,7 +330,7 @@ TEST_F(ByteStreamTest, ByteStream_SinkCallback) {
int num_callbacks = 0;
byte_stream_output->RegisterCallback(
base::Bind(CountCallbacks, &num_callbacks));
- EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, 0))
+ EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, base::TimeDelta()))
.WillOnce(DoAll(SaveArg<1>(&intermediate_callback),
Return(true)));
@@ -411,7 +404,7 @@ TEST_F(ByteStreamTest, ByteStream_SourceCallback) {
EXPECT_TRUE(ValidateIOBuffer(output_io_buffer, output_length));
// Setup expectations.
- EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, 0))
+ EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, base::TimeDelta()))
.WillOnce(DoAll(SaveArg<1>(&intermediate_callback),
Return(true)));
@@ -430,7 +423,7 @@ TEST_F(ByteStreamTest, ByteStream_SourceCallback) {
EXPECT_EQ(1, num_callbacks);
// Same drill with final buffer.
- EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, 0))
+ EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, base::TimeDelta()))
.WillOnce(DoAll(SaveArg<1>(&intermediate_callback),
Return(true)));
EXPECT_EQ(content::ByteStreamReader::STREAM_HAS_DATA,
@@ -469,7 +462,7 @@ TEST_F(ByteStreamTest, ByteStream_SinkInterrupt) {
int num_callbacks = 0;
byte_stream_output->RegisterCallback(
base::Bind(CountCallbacks, &num_callbacks));
- EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, 0))
+ EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, base::TimeDelta()))
.WillOnce(DoAll(SaveArg<1>(&intermediate_callback),
Return(true)));
@@ -535,7 +528,7 @@ TEST_F(ByteStreamTest, ByteStream_SourceInterrupt) {
message_loop_.RunAllPending();
// Setup expectations.
- EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, 0))
+ EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, base::TimeDelta()))
.WillOnce(DoAll(SaveArg<1>(&intermediate_callback),
Return(true)));
@@ -556,7 +549,7 @@ TEST_F(ByteStreamTest, ByteStream_SourceInterrupt) {
EXPECT_EQ(1, num_alt_callbacks);
// Third get should also trigger callback.
- EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, 0))
+ EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, base::TimeDelta()))
.WillOnce(DoAll(SaveArg<1>(&intermediate_callback),
Return(true)));
EXPECT_EQ(content::ByteStreamReader::STREAM_HAS_DATA,
@@ -588,7 +581,7 @@ TEST_F(ByteStreamTest, ByteStream_ZeroCallback) {
int num_callbacks = 0;
byte_stream_output->RegisterCallback(
base::Bind(CountCallbacks, &num_callbacks));
- EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, 0))
+ EXPECT_CALL(*task_runner.get(), PostDelayedTask(_, _, base::TimeDelta()))
.WillOnce(DoAll(SaveArg<1>(&intermediate_callback),
Return(true)));
« no previous file with comments | « content/browser/browser_thread_impl.cc ('k') | content/public/browser/browser_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698