| 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 44bca9a8848a47b34b65f25e7354fef1b929274c..42f08ec9cc4760dd9ba41f48c52fa09629a42259 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::ByteStreamOutput::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::ByteStreamOutput::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)));
|
|
|
|
|