third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandleTest.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/ReadableStreamDataConsumerHandle.h ('k') | third_party/WebKit/Source/modules/fetch/RequestInit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandleTest.cpp

diff --git a/third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandleTest.cpp b/third_party/WebKit/Source/modules/fetch/ReadableStreamDataConsumerHandleTest.cpp

index 3cfcf1a862e58d3072a36f220c8f4f1627df06fb..fd891485b447dd19989bd7b993afecfc5a7b7613 100644

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

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

@@ -16,7 +16,6 @@

#include "public/platform/WebDataConsumerHandle.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include <memory>

#include <v8.h>

// TODO(yhirano): Add cross-thread tests once the handle gets thread-safe.

@@ -82,7 +81,7 @@ public:

return r;

}

- std::unique_ptr<ReadableStreamDataConsumerHandle> createHandle(ScriptValue stream)

+ PassOwnPtr<ReadableStreamDataConsumerHandle> createHandle(ScriptValue stream)

{

NonThrowableExceptionState es;

ScriptValue reader = ReadableStreamOperations::getReader(getScriptState(), stream, es);

@@ -94,7 +93,7 @@ public:

void gc() { V8GCController::collectAllGarbageForTesting(isolate()); }

private:

- std::unique_ptr<DummyPageHolder> m_page;

+ OwnPtr<DummyPageHolder> m_page;

};

TEST_F(ReadableStreamDataConsumerHandleTest, Create)

@@ -102,7 +101,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, Create)

ScriptState::Scope scope(getScriptState());

ScriptValue stream(getScriptState(), evalWithPrintingError("new ReadableStream"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -112,7 +111,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, Create)

EXPECT_CALL(*client, didGetReadable());

EXPECT_CALL(checkpoint, Call(2));

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -125,7 +124,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EmptyStream)

ScriptValue stream(getScriptState(), evalWithPrintingError(

"new ReadableStream({start: c => c.close()})"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -139,7 +138,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EmptyStream)

char c;

size_t readBytes;

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -156,7 +155,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, ErroredStream)

ScriptValue stream(getScriptState(), evalWithPrintingError(

"new ReadableStream({start: c => c.error()})"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -170,7 +169,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, ErroredStream)

char c;

size_t readBytes;

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -193,7 +192,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, Read)

"controller.close();"

"stream"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -213,7 +212,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, Read)

char buffer[3];

size_t readBytes;

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -261,7 +260,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, TwoPhaseRead)

"controller.close();"

"stream"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -281,7 +280,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, TwoPhaseRead)

const void* buffer;

size_t available;

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -338,7 +337,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EnqueueUndefined)

"controller.close();"

"stream"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -352,7 +351,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EnqueueUndefined)

const void* buffer;

size_t available;

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -373,7 +372,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EnqueueNull)

"controller.close();"

"stream"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -387,7 +386,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EnqueueNull)

const void* buffer;

size_t available;

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -408,7 +407,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EnqueueString)

"controller.close();"

"stream"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

Persistent<MockClient> client = MockClient::create();

Checkpoint checkpoint;

@@ -422,7 +421,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EnqueueString)

const void* buffer;

size_t available;

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

+ OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(client);

ASSERT_TRUE(reader);

checkpoint.Call(1);

testing::runPendingTasks();

@@ -435,7 +434,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, EnqueueString)

TEST_F(ReadableStreamDataConsumerHandleTest, StreamReaderShouldBeWeak)

{

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader;

+ OwnPtr<FetchDataConsumerHandle::Reader> reader;

Checkpoint checkpoint;

Persistent<MockClient> client = MockClient::create();

ScriptValue stream;

@@ -453,7 +452,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, StreamReaderShouldBeWeak)

ScriptState::Scope scope(getScriptState());

stream = ScriptValue(getScriptState(), evalWithPrintingError("new ReadableStream()"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

reader = handle->obtainReader(client);

@@ -476,7 +475,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, StreamReaderShouldBeWeak)

TEST_F(ReadableStreamDataConsumerHandleTest, StreamReaderShouldBeWeakWhenReading)

{

- std::unique_ptr<FetchDataConsumerHandle::Reader> reader;

+ OwnPtr<FetchDataConsumerHandle::Reader> reader;

Checkpoint checkpoint;

Persistent<MockClient> client = MockClient::create();

ScriptValue stream;

@@ -495,7 +494,7 @@ TEST_F(ReadableStreamDataConsumerHandleTest, StreamReaderShouldBeWeakWhenReading

ScriptState::Scope scope(getScriptState());

stream = ScriptValue(getScriptState(), evalWithPrintingError("new ReadableStream()"));

ASSERT_FALSE(stream.isEmpty());

- std::unique_ptr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

+ OwnPtr<ReadableStreamDataConsumerHandle> handle = createHandle(stream);

ASSERT_TRUE(handle);

reader = handle->obtainReader(client);