Index: third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp |
diff --git a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp |
index b49316cadfc7d072962900eae4f12073d30c9d11..0c0875b613e97e6642310241ecd7d9d0c41003a9 100644 |
--- a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp |
+++ b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp |
@@ -112,8 +112,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, CreateLoader) |
= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory); |
testing::runPendingTasks(); |
+ char buffer[1]; |
size_t size = 0; |
- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); |
+ ASSERT_EQ(kShouldWait, handle->obtainReader(nullptr)->read(buffer, sizeof(buffer), kNone, &size)); |
checkpoint.Call(1); |
testing::runPendingTasks(); |
checkpoint.Call(2); |
@@ -154,8 +155,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenStopped) |
= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory); |
testing::runPendingTasks(); |
+ char buffer[1]; |
size_t size = 0; |
- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); |
+ ASSERT_EQ(kShouldWait, handle->obtainReader(nullptr)->read(buffer, sizeof(buffer), kNone, &size)); |
checkpoint.Call(1); |
testing::runPendingTasks(); |
checkpoint.Call(2); |
@@ -185,8 +187,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenDestinationDetached) |
std::unique_ptr<WebDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr); |
testing::runPendingTasks(); |
+ char buffer[1]; |
size_t size = 0; |
- reader->read(nullptr, 0, kNone, &size); |
+ ASSERT_EQ(kShouldWait, reader->read(buffer, sizeof(buffer), kNone, &size)); |
checkpoint.Call(1); |
testing::runPendingTasks(); |
checkpoint.Call(2); |
@@ -223,8 +226,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, ReadTest) |
src->add(Command(Command::Wait)); |
src->add(Command(Command::Done)); |
+ char buffer[1]; |
size_t size = 0; |
- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); |
+ ASSERT_EQ(kShouldWait, handle->obtainReader(nullptr)->read(buffer, sizeof(buffer), kNone, &size)); |
checkpoint.Call(1); |
testing::runPendingTasks(); |
checkpoint.Call(2); |
@@ -261,8 +265,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, TwoPhaseReadTest) |
src->add(Command(Command::Wait)); |
src->add(Command(Command::Done)); |
+ char buffer[1]; |
size_t size = 0; |
- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); |
+ ASSERT_EQ(kShouldWait, handle->obtainReader(nullptr)->read(buffer, sizeof(buffer), kNone, &size)); |
checkpoint.Call(1); |
testing::runPendingTasks(); |
checkpoint.Call(2); |
@@ -291,8 +296,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, LoadErrorTest) |
std::unique_ptr<WebDataConsumerHandle> handle |
= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory); |
+ char buffer[1]; |
size_t size = 0; |
- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); |
+ ASSERT_EQ(kShouldWait, handle->obtainReader(nullptr)->read(buffer, sizeof(buffer), kNone, &size)); |
checkpoint.Call(1); |
testing::runPendingTasks(); |
checkpoint.Call(2); |
@@ -326,8 +332,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, BodyLoadErrorTest) |
src->add(Command(Command::Data, "hello, ")); |
src->add(Command(Command::Error)); |
+ char buffer[1]; |
size_t size = 0; |
- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); |
+ ASSERT_EQ(kShouldWait, handle->obtainReader(nullptr)->read(buffer, sizeof(buffer), kNone, &size)); |
checkpoint.Call(1); |
testing::runPendingTasks(); |
checkpoint.Call(2); |