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

Unified Diff: net/base/upload_data_stream_unittest.cc

Issue 11778016: net: Stop using base::WorkerPool from UploadFileElementReader (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: _ Created 7 years, 11 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
Index: net/base/upload_data_stream_unittest.cc
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc
index 4740e0ae168a4cd6f9ab1b096c3ff2eaa3215308..49c8da864c330d57e04584c2bdd26de891816aac 100644
--- a/net/base/upload_data_stream_unittest.cc
+++ b/net/base/upload_data_stream_unittest.cc
@@ -169,6 +169,7 @@ TEST_F(UploadDataStreamTest, File) {
file_util::WriteFile(temp_file_path, kTestData, kTestDataSize));
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, 0, kuint64max, base::Time()));
TestCompletionCallback init_callback;
@@ -202,6 +203,7 @@ TEST_F(UploadDataStreamTest, FileSmallerThanLength) {
overriding_content_length(kFakeSize);
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, 0, kuint64max, base::Time()));
TestCompletionCallback init_callback;
@@ -313,6 +315,7 @@ TEST_F(UploadDataStreamTest, FileAndBytes) {
const uint64 kFileRangeOffset = 1;
const uint64 kFileRangeLength = 4;
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, kFileRangeOffset, kFileRangeLength, base::Time()));
element_readers_.push_back(new UploadBytesElementReader(
@@ -509,7 +512,8 @@ void UploadDataStreamTest::FileChangedHelper(const FilePath& file_path,
// Don't use element_readers_ here, as this function is called twice, and
// reusing element_readers_ is wrong.
ScopedVector<UploadElementReader> element_readers;
- element_readers.push_back(new UploadFileElementReader(file_path, 1, 2, time));
+ element_readers.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(), file_path, 1, 2, time));
TestCompletionCallback init_callback;
UploadDataStream stream(&element_readers, 0);
@@ -551,6 +555,7 @@ TEST_F(UploadDataStreamTest, MultipleInit) {
element_readers_.push_back(new UploadBytesElementReader(
kTestData, kTestDataSize));
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, 0, kuint64max, base::Time()));
UploadDataStream stream(&element_readers_, 0);
@@ -592,6 +597,7 @@ TEST_F(UploadDataStreamTest, MultipleInitAsync) {
element_readers_.push_back(new UploadBytesElementReader(
kTestData, kTestDataSize));
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, 0, kuint64max, base::Time()));
UploadDataStream stream(&element_readers_, 0);
@@ -630,6 +636,7 @@ TEST_F(UploadDataStreamTest, InitToReset) {
element_readers_.push_back(new UploadBytesElementReader(
kTestData, kTestDataSize));
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, 0, kuint64max, base::Time()));
UploadDataStream stream(&element_readers_, 0);
@@ -681,6 +688,7 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncInit) {
element_readers_.push_back(new UploadBytesElementReader(
kTestData, kTestDataSize));
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, 0, kuint64max, base::Time()));
UploadDataStream stream(&element_readers_, 0);
@@ -724,6 +732,7 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncRead) {
element_readers_.push_back(new UploadBytesElementReader(
kTestData, kTestDataSize));
element_readers_.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current(),
temp_file_path, 0, kuint64max, base::Time()));
UploadDataStream stream(&element_readers_, 0);

Powered by Google App Engine
This is Rietveld 408576698