third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp - Issue 2177243002: Use per-frame TaskRunner instead of thread's default in DataConsumerHandle

Unified Diff: third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.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/FetchBlobDataConsumerHandle.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchDataConsumerHandle.h » ('j') | third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandle.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 50c03d4bab570fceaa206d45149246ba1e582680..b4de1167b5b27d53e93f7b9b111f1dc8150973ec 100644

--- a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

+++ b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

@@ -119,7 +119,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, CreateLoader)

testing::runPendingTasks();

size_t size = 0;

- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);

+ handle->obtainReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size);

checkpoint.Call(1);

testing::runPendingTasks();

checkpoint.Call(2);

@@ -162,7 +162,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenStopped)

testing::runPendingTasks();

size_t size = 0;

- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);

+ handle->obtainReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size);

checkpoint.Call(1);

testing::runPendingTasks();

checkpoint.Call(2);

@@ -190,7 +190,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenDestinationDetached)

RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");

std::unique_ptr<WebDataConsumerHandle> handle

= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);

- std::unique_ptr<WebDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);

+ std::unique_ptr<WebDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr, getCurrentTaskRunner());

testing::runPendingTasks();

size_t size = 0;

@@ -233,7 +233,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, ReadTest)

src->add(Command(Command::Done));

size_t size = 0;

- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);

+ handle->obtainReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size);

checkpoint.Call(1);

testing::runPendingTasks();

checkpoint.Call(2);

@@ -272,7 +272,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, TwoPhaseReadTest)

src->add(Command(Command::Done));

size_t size = 0;

- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);

+ handle->obtainReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size);

checkpoint.Call(1);

testing::runPendingTasks();

checkpoint.Call(2);

@@ -303,7 +303,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, LoadErrorTest)

= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);

size_t size = 0;

- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);

+ handle->obtainReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size);

checkpoint.Call(1);

testing::runPendingTasks();

checkpoint.Call(2);

@@ -339,7 +339,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, BodyLoadErrorTest)

src->add(Command(Command::Error));

size_t size = 0;

- handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);

+ handle->obtainReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size);

checkpoint.Call(1);

testing::runPendingTasks();

checkpoint.Call(2);

@@ -358,10 +358,10 @@ TEST_F(FetchBlobDataConsumerHandleTest, DrainAsBlobDataHandle)

= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);

size_t size = 0;

- EXPECT_EQ(blobDataHandle, handle->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle());

- EXPECT_FALSE(handle->obtainFetchDataReader(nullptr)->drainAsFormData());

+ EXPECT_EQ(blobDataHandle, handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle());

+ EXPECT_FALSE(handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsFormData());

- EXPECT_EQ(kDone, handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size));

+ EXPECT_EQ(kDone, handle->obtainReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size));

}

TEST_F(FetchBlobDataConsumerHandleTest, DrainAsFormData)

@@ -372,7 +372,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, DrainAsFormData)

std::unique_ptr<FetchDataConsumerHandle> handle

= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);

- RefPtr<EncodedFormData> formData = handle->obtainFetchDataReader(nullptr)->drainAsFormData();

+ RefPtr<EncodedFormData> formData = handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsFormData();

ASSERT_TRUE(formData);

EXPECT_TRUE(formData->isSafeToSendToAnotherThread());

ASSERT_EQ(1u, formData->elements().size());

@@ -380,9 +380,9 @@ TEST_F(FetchBlobDataConsumerHandleTest, DrainAsFormData)

EXPECT_EQ(blobDataHandle->uuid(), formData->elements()[0].m_blobUUID);

EXPECT_EQ(blobDataHandle, formData->elements()[0].m_optionalBlobDataHandle);

- EXPECT_FALSE(handle->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle());

+ EXPECT_FALSE(handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle());

size_t size;

- EXPECT_EQ(kDone, handle->obtainFetchDataReader(nullptr)->read(nullptr, 0, kNone, &size));

+ EXPECT_EQ(kDone, handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->read(nullptr, 0, kNone, &size));

}

TEST_F(FetchBlobDataConsumerHandleTest, ZeroByteReadDoesNotAffectDraining)

@@ -392,7 +392,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, ZeroByteReadDoesNotAffectDraining)

RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");

std::unique_ptr<FetchDataConsumerHandle> handle

= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr);

+ std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner());

size_t readSize;

EXPECT_EQ(kShouldWait, reader->read(nullptr, 0, kNone, &readSize));

@@ -406,7 +406,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, OneByteReadAffectsDraining)

RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");

std::unique_ptr<FetchDataConsumerHandle> handle

= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr);

+ std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner());

size_t readSize;

char c;

@@ -421,7 +421,7 @@ TEST_F(FetchBlobDataConsumerHandleTest, BeginReadAffectsDraining)

RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");

std::unique_ptr<FetchDataConsumerHandle> handle

= FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, factory);

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr);

+ std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainFetchDataReader(nullptr, getCurrentTaskRunner());

const void* buffer;

size_t available;