Index: net/base/elements_upload_data_stream_unittest.cc |
diff --git a/net/base/elements_upload_data_stream_unittest.cc b/net/base/elements_upload_data_stream_unittest.cc |
index 78229d2f76d366132472cb65dddae9604c0b0fa2..246dd9414686b5fe141cd6cee0f55b91e3d2367e 100644 |
--- a/net/base/elements_upload_data_stream_unittest.cc |
+++ b/net/base/elements_upload_data_stream_unittest.cc |
@@ -15,6 +15,7 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
+#include "base/thread_task_runner_handle.h" |
#include "base/time/time.h" |
#include "net/base/io_buffer.h" |
#include "net/base/net_errors.h" |
@@ -180,11 +181,8 @@ TEST_F(ElementsUploadDataStreamTest, File) { |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- 0, |
- kuint64max, |
- base::Time())); |
+ new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
+ temp_file_path, 0, kuint64max, base::Time())); |
TestCompletionCallback init_callback; |
scoped_ptr<UploadDataStream> stream( |
@@ -219,11 +217,8 @@ TEST_F(ElementsUploadDataStreamTest, FileSmallerThanLength) { |
overriding_content_length(kFakeSize); |
element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- 0, |
- kuint64max, |
- base::Time())); |
+ new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
+ temp_file_path, 0, kuint64max, base::Time())); |
TestCompletionCallback init_callback; |
scoped_ptr<UploadDataStream> stream( |
@@ -337,12 +332,9 @@ TEST_F(ElementsUploadDataStreamTest, FileAndBytes) { |
const uint64 kFileRangeOffset = 1; |
const uint64 kFileRangeLength = 4; |
- element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- kFileRangeOffset, |
- kFileRangeLength, |
- base::Time())); |
+ element_readers_.push_back(new UploadFileElementReader( |
+ base::ThreadTaskRunnerHandle::Get().get(), temp_file_path, |
+ kFileRangeOffset, kFileRangeLength, base::Time())); |
element_readers_.push_back(new UploadBytesElementReader( |
kTestData, kTestDataSize)); |
@@ -528,7 +520,7 @@ void ElementsUploadDataStreamTest::FileChangedHelper( |
// reusing element_readers_ is wrong. |
ScopedVector<UploadElementReader> element_readers; |
element_readers.push_back(new UploadFileElementReader( |
- base::MessageLoopProxy::current().get(), file_path, 1, 2, time)); |
+ base::ThreadTaskRunnerHandle::Get().get(), file_path, 1, 2, time)); |
TestCompletionCallback init_callback; |
scoped_ptr<UploadDataStream> stream( |
@@ -571,11 +563,8 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInit) { |
element_readers_.push_back(new UploadBytesElementReader( |
kTestData, kTestDataSize)); |
element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- 0, |
- kuint64max, |
- base::Time())); |
+ new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
+ temp_file_path, 0, kuint64max, base::Time())); |
scoped_ptr<UploadDataStream> stream( |
new ElementsUploadDataStream(element_readers_.Pass(), 0)); |
@@ -617,11 +606,8 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInitAsync) { |
element_readers_.push_back(new UploadBytesElementReader( |
kTestData, kTestDataSize)); |
element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- 0, |
- kuint64max, |
- base::Time())); |
+ new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
+ temp_file_path, 0, kuint64max, base::Time())); |
scoped_ptr<UploadDataStream> stream( |
new ElementsUploadDataStream(element_readers_.Pass(), 0)); |
@@ -660,11 +646,8 @@ TEST_F(ElementsUploadDataStreamTest, InitToReset) { |
element_readers_.push_back(new UploadBytesElementReader( |
kTestData, kTestDataSize)); |
element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- 0, |
- kuint64max, |
- base::Time())); |
+ new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
+ temp_file_path, 0, kuint64max, base::Time())); |
scoped_ptr<UploadDataStream> stream( |
new ElementsUploadDataStream(element_readers_.Pass(), 0)); |
@@ -719,11 +702,8 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncInit) { |
element_readers_.push_back(new UploadBytesElementReader( |
kTestData, kTestDataSize)); |
element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- 0, |
- kuint64max, |
- base::Time())); |
+ new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
+ temp_file_path, 0, kuint64max, base::Time())); |
scoped_ptr<UploadDataStream> stream( |
new ElementsUploadDataStream(element_readers_.Pass(), 0)); |
@@ -768,11 +748,8 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncRead) { |
element_readers_.push_back(new UploadBytesElementReader( |
kTestData, kTestDataSize)); |
element_readers_.push_back( |
- new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
- temp_file_path, |
- 0, |
- kuint64max, |
- base::Time())); |
+ new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
+ temp_file_path, 0, kuint64max, base::Time())); |
scoped_ptr<UploadDataStream> stream( |
new ElementsUploadDataStream(element_readers_.Pass(), 0)); |