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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/fetch/FetchDataLoaderTest.cpp

Issue 2177243002: Use per-frame TaskRunner instead of thread's default in DataConsumerHandle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@data_consumer_handle_unique_ptr
Patch Set: update Created 4 years, 5 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 | « third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.h » ('j') | third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandle.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/fetch/FetchDataLoaderTest.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchDataLoaderTest.cpp b/third_party/WebKit/Source/modules/fetch/FetchDataLoaderTest.cpp
index 169f07182e03932c38b836ce98f59b02d1222fca..71fdf3c7347f70c39cb40e86e6a3b3972710e9b9 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchDataLoaderTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchDataLoaderTest.cpp
@@ -52,7 +52,7 @@ TEST(FetchDataLoaderTest, LoadAsBlob)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(nullptr));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));
@@ -64,7 +64,7 @@ TEST(FetchDataLoaderTest, LoadAsBlob)
EXPECT_CALL(checkpoint, Call(4));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
ASSERT_TRUE(client);
client->didGetReadable();
@@ -92,7 +92,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobFailed)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(nullptr));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));
@@ -104,7 +104,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobFailed)
EXPECT_CALL(checkpoint, Call(4));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
ASSERT_TRUE(client);
client->didGetReadable();
@@ -127,14 +127,14 @@ TEST(FetchDataLoaderTest, LoadAsBlobCancel)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(nullptr));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, destruct());
EXPECT_CALL(checkpoint, Call(3));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
fetchDataLoader->cancel();
checkpoint.Call(3);
@@ -160,7 +160,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithSameContentType)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(inputBlobDataHandle));
EXPECT_CALL(*reader, destruct());
EXPECT_CALL(*fetchDataLoaderClient, didFetchDataLoadedBlobHandleMock(_)).WillOnce(SaveArg<0>(&blobDataHandle));
@@ -168,7 +168,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithSameContentType)
EXPECT_CALL(checkpoint, Call(3));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
fetchDataLoader->cancel();
checkpoint.Call(3);
@@ -199,7 +199,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithDifferentContent
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(inputBlobDataHandle));
EXPECT_CALL(*reader, destruct());
EXPECT_CALL(*fetchDataLoaderClient, didFetchDataLoadedBlobHandleMock(_)).WillOnce(SaveArg<0>(&blobDataHandle));
@@ -207,7 +207,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithDifferentContent
EXPECT_CALL(checkpoint, Call(3));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
fetchDataLoader->cancel();
checkpoint.Call(3);
@@ -234,7 +234,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBuffer)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));
EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));
@@ -245,7 +245,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBuffer)
EXPECT_CALL(checkpoint, Call(4));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
ASSERT_TRUE(client);
client->didGetReadable();
@@ -273,7 +273,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferFailed)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));
EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));
@@ -284,7 +284,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferFailed)
EXPECT_CALL(checkpoint, Call(4));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
ASSERT_TRUE(client);
client->didGetReadable();
@@ -306,13 +306,13 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferCancel)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, destruct());
EXPECT_CALL(checkpoint, Call(3));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
fetchDataLoader->cancel();
checkpoint.Call(3);
@@ -333,7 +333,7 @@ TEST(FetchDataLoaderTest, LoadAsString)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLength), Return(kOk)));
EXPECT_CALL(*reader, endRead(kQuickBrownFoxLength)).WillOnce(Return(kOk));
@@ -344,7 +344,7 @@ TEST(FetchDataLoaderTest, LoadAsString)
EXPECT_CALL(checkpoint, Call(4));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
ASSERT_TRUE(client);
client->didGetReadable();
@@ -368,7 +368,7 @@ TEST(FetchDataLoaderTest, LoadAsStringWithNullBytes)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>("Quick\0brown\0fox")), SetArgPointee<2>(16), Return(kOk)));
EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));
@@ -379,7 +379,7 @@ TEST(FetchDataLoaderTest, LoadAsStringWithNullBytes)
EXPECT_CALL(checkpoint, Call(4));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
ASSERT_TRUE(client);
client->didGetReadable();
@@ -403,7 +403,7 @@ TEST(FetchDataLoaderTest, LoadAsStringError)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(ByMove(WTF::wrapUnique(reader)))));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLength), Return(kOk)));
EXPECT_CALL(*reader, endRead(kQuickBrownFoxLength)).WillOnce(Return(kOk));
@@ -414,7 +414,7 @@ TEST(FetchDataLoaderTest, LoadAsStringError)
EXPECT_CALL(checkpoint, Call(4));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
ASSERT_TRUE(client);
client->didGetReadable();
@@ -437,13 +437,13 @@ TEST(FetchDataLoaderTest, LoadAsStringCancel)
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
- EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
+ EXPECT_CALL(*handle, obtainFetchDataReaderMock(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
EXPECT_CALL(checkpoint, Call(2));
EXPECT_CALL(*reader, destruct());
EXPECT_CALL(checkpoint, Call(3));
checkpoint.Call(1);
- fetchDataLoader->start(handle.get(), fetchDataLoaderClient);
+ fetchDataLoader->start(handle.get(), fetchDataLoaderClient, getCurrentTaskRunner());
checkpoint.Call(2);
fetchDataLoader->cancel();
checkpoint.Call(3);
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.h » ('j') | third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandle.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698