| Index: third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
|
| index a547d78976bec58a5d6a9cb8c06077c82309485e..83ed30bdb9ff5e88d498b5891ee5e391124a9384 100644
|
| --- a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
|
| @@ -22,7 +22,9 @@ namespace blink {
|
|
|
| namespace {
|
|
|
| +using ::testing::ByMove;
|
| using ::testing::InSequence;
|
| +using ::testing::Return;
|
| using ::testing::_;
|
| using ::testing::SaveArg;
|
| using Checkpoint = ::testing::StrictMock<::testing::MockFunction<void(int)>>;
|
| @@ -483,20 +485,18 @@ TEST_F(BodyStreamBufferTest, SourceHandleAndReaderShouldBeDestructedWhenCanceled
|
| using MockHandle = MockFetchDataConsumerHandleWithMockDestructor;
|
| using MockReader = DataConsumerHandleTestUtil::MockFetchDataConsumerReader;
|
| std::unique_ptr<MockHandle> handle = MockHandle::create();
|
| - std::unique_ptr<MockReader> reader = MockReader::create();
|
| + // |reader| will be adopted by |obtainFetchDataReader|.
|
| + MockReader* reader = MockReader::create().release();
|
|
|
| Checkpoint checkpoint;
|
| InSequence s;
|
|
|
| - EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(::testing::Return(reader.get()));
|
| + EXPECT_CALL(*handle, obtainFetchDataReader(_)).WillOnce(Return(ByMove(WTF::wrapUnique(reader))));
|
| EXPECT_CALL(checkpoint, Call(1));
|
| EXPECT_CALL(*reader, destruct());
|
| EXPECT_CALL(*handle, destruct());
|
| EXPECT_CALL(checkpoint, Call(2));
|
|
|
| - // |reader| is adopted by |obtainReader|.
|
| - ASSERT_TRUE(reader.release());
|
| -
|
| BodyStreamBuffer* buffer = new BodyStreamBuffer(scope.getScriptState(), std::move(handle));
|
| checkpoint.Call(1);
|
| ScriptValue reason(scope.getScriptState(), v8String(scope.getScriptState()->isolate(), "reason"));
|
|
|