third_party/WebKit/Source/modules/fetch/FetchDataLoaderTest.cpp - Issue 2050123002: Remove OwnPtr from Blink.

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

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

Patch Set: First attempt to land. 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/FetchDataLoader.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9c031faca1a3a3b1320205fd2a27698eea643fb4..666ac4404bfaa9fba403fde6599004f152572f8a 100644

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

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

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

#include "modules/fetch/DataConsumerHandleTestUtil.h"

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

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

+#include <memory>

namespace blink {

@@ -39,8 +40,8 @@ TEST(FetchDataLoaderTest, LoadAsBlob)

WebDataConsumerHandle::Client *client = nullptr;

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsBlobHandle("text/test");

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

RefPtr<BlobDataHandle> blobDataHandle;

@@ -59,7 +60,7 @@ TEST(FetchDataLoaderTest, LoadAsBlob)

EXPECT_CALL(checkpoint, Call(4));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -80,8 +81,8 @@ TEST(FetchDataLoaderTest, LoadAsBlobFailed)

WebDataConsumerHandle::Client *client = nullptr;

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsBlobHandle("text/test");

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -99,7 +100,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobFailed)

EXPECT_CALL(checkpoint, Call(4));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -115,8 +116,8 @@ TEST(FetchDataLoaderTest, LoadAsBlobCancel)

{

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsBlobHandle("text/test");

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -129,7 +130,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobCancel)

EXPECT_CALL(checkpoint, Call(3));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -140,15 +141,15 @@ TEST(FetchDataLoaderTest, LoadAsBlobCancel)

TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithSameContentType)

{

- OwnPtr<BlobData> blobData = BlobData::create();

+ std::unique_ptr<BlobData> blobData = BlobData::create();

blobData->appendBytes(kQuickBrownFox, kQuickBrownFoxLengthWithTerminatingNull);

blobData->setContentType("text/test");

RefPtr<BlobDataHandle> inputBlobDataHandle = BlobDataHandle::create(std::move(blobData), kQuickBrownFoxLengthWithTerminatingNull);

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsBlobHandle("text/test");

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

RefPtr<BlobDataHandle> blobDataHandle;

@@ -163,7 +164,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithSameContentType)

EXPECT_CALL(checkpoint, Call(3));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -179,15 +180,15 @@ TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithSameContentType)

TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithDifferentContentType)

{

- OwnPtr<BlobData> blobData = BlobData::create();

+ std::unique_ptr<BlobData> blobData = BlobData::create();

blobData->appendBytes(kQuickBrownFox, kQuickBrownFoxLengthWithTerminatingNull);

blobData->setContentType("text/different");

RefPtr<BlobDataHandle> inputBlobDataHandle = BlobDataHandle::create(std::move(blobData), kQuickBrownFoxLengthWithTerminatingNull);

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsBlobHandle("text/test");

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

RefPtr<BlobDataHandle> blobDataHandle;

@@ -202,7 +203,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobViaDrainAsBlobDataHandleWithDifferentContent

EXPECT_CALL(checkpoint, Call(3));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -221,8 +222,8 @@ TEST(FetchDataLoaderTest, LoadAsArrayBuffer)

WebDataConsumerHandle::Client *client = nullptr;

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsArrayBuffer();

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

DOMArrayBuffer* arrayBuffer = nullptr;

@@ -240,7 +241,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBuffer)

EXPECT_CALL(checkpoint, Call(4));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -261,8 +262,8 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferFailed)

WebDataConsumerHandle::Client *client = nullptr;

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsArrayBuffer();

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -279,7 +280,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferFailed)

EXPECT_CALL(checkpoint, Call(4));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -295,8 +296,8 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferCancel)

{

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsArrayBuffer();

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -308,7 +309,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferCancel)

EXPECT_CALL(checkpoint, Call(3));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -322,8 +323,8 @@ TEST(FetchDataLoaderTest, LoadAsString)

WebDataConsumerHandle::Client *client = nullptr;

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsString();

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -340,7 +341,7 @@ TEST(FetchDataLoaderTest, LoadAsString)

EXPECT_CALL(checkpoint, Call(4));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -357,8 +358,8 @@ TEST(FetchDataLoaderTest, LoadAsStringWithNullBytes)

WebDataConsumerHandle::Client *client = nullptr;

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsString();

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -375,7 +376,7 @@ TEST(FetchDataLoaderTest, LoadAsStringWithNullBytes)

EXPECT_CALL(checkpoint, Call(4));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -392,8 +393,8 @@ TEST(FetchDataLoaderTest, LoadAsStringError)

WebDataConsumerHandle::Client *client = nullptr;

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsString();

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -410,7 +411,7 @@ TEST(FetchDataLoaderTest, LoadAsStringError)

EXPECT_CALL(checkpoint, Call(4));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);

@@ -426,8 +427,8 @@ TEST(FetchDataLoaderTest, LoadAsStringCancel)

{

Checkpoint checkpoint;

- OwnPtr<MockHandle> handle = MockHandle::create();

- OwnPtr<MockReader> reader = MockReader::create();

+ std::unique_ptr<MockHandle> handle = MockHandle::create();

+ std::unique_ptr<MockReader> reader = MockReader::create();

FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsString();

MockFetchDataLoaderClient* fetchDataLoaderClient = MockFetchDataLoaderClient::create();

@@ -439,7 +440,7 @@ TEST(FetchDataLoaderTest, LoadAsStringCancel)

EXPECT_CALL(checkpoint, Call(3));

// |reader| is adopted by |obtainReader|.

- ASSERT_TRUE(reader.leakPtr());

+ ASSERT_TRUE(reader.release());

checkpoint.Call(1);

fetchDataLoader->start(handle.get(), fetchDataLoaderClient);