Use per-frame TaskRunner instead of thread's default in DataConsumerHandle

third_party/WebKit/Source/modules/fetch/DataConsumerTeeTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/DataConsumerTee.h"
 
 #include "core/testing/DummyPageHolder.h"
 #include "core/testing/NullExecutionContext.h"
 #include "modules/fetch/DataConsumerHandleTestUtil.h"
 #include "platform/CrossThreadFunctional.h"
@@ skipping 320 matching lines @@
 {
     RefPtr<BlobDataHandle> blobDataHandle = BlobDataHandle::create();
     std::unique_ptr<MockFetchDataConsumerHandle> src(MockFetchDataConsumerHandle::create());
 
     // |reader| will be adopted by |obtainFetchDataReader|.
     MockFetchDataConsumerReader* reader = MockFetchDataConsumerReader::create().release();
 
     Checkpoint checkpoint;
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
-    EXPECT_CALL(*src, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
+    EXPECT_CALL(*src, obtainFetchDataReaderMock(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
     EXPECT_CALL(*reader, drainAsBlobDataHandle(kAllowBlobWithInvalidSize)).WillOnce(Return(blobDataHandle));
     EXPECT_CALL(*reader, destruct());
     EXPECT_CALL(checkpoint, Call(2));
 
     std::unique_ptr<FetchDataConsumerHandle> dest1, dest2;
     std::unique_ptr<TeeCreationThread<FetchDataConsumerHandle>> t = wrapUnique(new TeeCreationThread<FetchDataConsumerHandle>());
 
     checkpoint.Call(1);
     t->run(std::move(src), &dest1, &dest2);
     checkpoint.Call(2);
 
     ASSERT_TRUE(dest1);
     ASSERT_TRUE(dest2);
-    EXPECT_EQ(blobDataHandle, dest1->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
-    EXPECT_EQ(blobDataHandle, dest2->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
+    EXPECT_EQ(blobDataHandle, dest1->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
+    EXPECT_EQ(blobDataHandle, dest2->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
 }
 
 TEST(FetchDataConsumerTeeTest, CreateFromBlobWithInvalidSize)
 {
     RefPtr<BlobDataHandle> blobDataHandle = BlobDataHandle::create(BlobData::create(), -1);
     std::unique_ptr<MockFetchDataConsumerHandle> src(MockFetchDataConsumerHandle::create());
 
     // |reader| is adopted by |obtainFetchDataReader|.
     MockFetchDataConsumerReader* reader = MockFetchDataConsumerReader::create().release();
 
     Checkpoint checkpoint;
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
-    EXPECT_CALL(*src, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
+    EXPECT_CALL(*src, obtainFetchDataReaderMock(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
     EXPECT_CALL(*reader, drainAsBlobDataHandle(kAllowBlobWithInvalidSize)).WillOnce(Return(blobDataHandle));
     EXPECT_CALL(*reader, destruct());
     EXPECT_CALL(checkpoint, Call(2));
 
     std::unique_ptr<FetchDataConsumerHandle> dest1, dest2;
     std::unique_ptr<TeeCreationThread<FetchDataConsumerHandle>> t = wrapUnique(new TeeCreationThread<FetchDataConsumerHandle>());
 
     checkpoint.Call(1);
     t->run(std::move(src), &dest1, &dest2);
     checkpoint.Call(2);
 
     ASSERT_TRUE(dest1);
     ASSERT_TRUE(dest2);
-    EXPECT_FALSE(dest1->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kDisallowBlobWithInvalidSize));
-    EXPECT_EQ(blobDataHandle, dest1->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
-    EXPECT_FALSE(dest2->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kDisallowBlobWithInvalidSize));
-    EXPECT_EQ(blobDataHandle, dest2->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
+    EXPECT_FALSE(dest1->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kDisallowBlobWithInvalidSize));
+    EXPECT_EQ(blobDataHandle, dest1->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
+    EXPECT_FALSE(dest2->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kDisallowBlobWithInvalidSize));
+    EXPECT_EQ(blobDataHandle, dest2->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
 }
 
 TEST(FetchDataConsumerTeeTest, CreateDone)
 {
     std::unique_ptr<Handle> src(Handle::create());
     std::unique_ptr<FetchDataConsumerHandle> dest1, dest2;
 
     src->add(Command(Command::Done));
 
     std::unique_ptr<TeeCreationThread<FetchDataConsumerHandle>> t = wrapUnique(new TeeCreationThread<FetchDataConsumerHandle>());
     t->run(createFetchDataConsumerHandleFromWebHandle(std::move(src)), &dest1, &dest2);
 
     ASSERT_TRUE(dest1);
     ASSERT_TRUE(dest2);
 
-    EXPECT_FALSE(dest1->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
-    EXPECT_FALSE(dest2->obtainFetchDataReader(nullptr)->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
+    EXPECT_FALSE(dest1->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
+    EXPECT_FALSE(dest2->obtainFetchDataReader(nullptr, getCurrentTaskRunner())->drainAsBlobDataHandle(kAllowBlobWithInvalidSize));
 
     HandleReaderRunner<HandleReader> r1(std::move(dest1)), r2(std::move(dest2));
 
     std::unique_ptr<HandleReadResult> res1 = r1.wait();
     std::unique_ptr<HandleReadResult> res2 = r2.wait();
 
     EXPECT_EQ(kDone, res1->result());
     EXPECT_EQ(0u, res1->data().size());
     EXPECT_EQ(kDone, res2->result());
     EXPECT_EQ(0u, res2->data().size());
 }
 
 } // namespace
 } // namespace blink