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

Unified Diff: third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandleTest.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/CompositeDataConsumerHandle.cpp ('k') | third_party/WebKit/Source/modules/fetch/CrossThreadHolder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 863dd6daa6971073371a4b6e076bb9aa67908a73..0ff02a9d6609ca95c06ba44d04233b444252590a 100644

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

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

@@ -14,6 +14,8 @@

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

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

#include "wtf/Locker.h"

+#include "wtf/PtrUtil.h"

+#include <memory>

namespace blink {

@@ -30,7 +32,7 @@ const WebDataConsumerHandle::Flags kNone = WebDataConsumerHandle::FlagNone;

class MockReader : public WebDataConsumerHandle::Reader {

public:

- static PassOwnPtr<StrictMock<MockReader>> create() { return adoptPtr(new StrictMock<MockReader>); }

+ static std::unique_ptr<StrictMock<MockReader>> create() { return wrapUnique(new StrictMock<MockReader>); }

using Result = WebDataConsumerHandle::Result;

using Flags = WebDataConsumerHandle::Flags;

@@ -41,7 +43,7 @@ public:

class MockHandle : public WebDataConsumerHandle {

public:

- static PassOwnPtr<StrictMock<MockHandle>> create() { return adoptPtr(new StrictMock<MockHandle>); }

+ static std::unique_ptr<StrictMock<MockHandle>> create() { return wrapUnique(new StrictMock<MockHandle>); }

MOCK_METHOD1(obtainReaderInternal, Reader*(Client*));

@@ -57,7 +59,7 @@ public:

void run()

{

ThreadHolder holder(this);

- m_waitableEvent = adoptPtr(new WaitableEvent());

+ m_waitableEvent = wrapUnique(new WaitableEvent());

postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::createHandle, this));

postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));

@@ -84,7 +86,7 @@ private:

postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));

}

- OwnPtr<WebDataConsumerHandle> m_handle;

+ std::unique_ptr<WebDataConsumerHandle> m_handle;

CrossThreadPersistent<CompositeDataConsumerHandle::Updater> m_updater;

};

@@ -96,7 +98,7 @@ public:

void run()

{

ThreadHolder holder(this);

- m_waitableEvent = adoptPtr(new WaitableEvent());

+ m_waitableEvent = wrapUnique(new WaitableEvent());

postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::createHandle, this));

postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));

@@ -125,7 +127,7 @@ private:

postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));

}

- OwnPtr<WebDataConsumerHandle> m_handle;

+ std::unique_ptr<WebDataConsumerHandle> m_handle;

CrossThreadPersistent<CompositeDataConsumerHandle::Updater> m_updater;

};

@@ -137,7 +139,7 @@ public:

void run()

{

ThreadHolder holder(this);

- m_waitableEvent = adoptPtr(new WaitableEvent());

+ m_waitableEvent = wrapUnique(new WaitableEvent());

postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::createHandle, this));

postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));

@@ -166,7 +168,7 @@ private:

postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));

}

- OwnPtr<WebDataConsumerHandle> m_handle;

+ std::unique_ptr<WebDataConsumerHandle> m_handle;

CrossThreadPersistent<CompositeDataConsumerHandle::Updater> m_updater;

};

@@ -178,8 +180,8 @@ public:

void run()

{

ThreadHolder holder(this);

- m_waitableEvent = adoptPtr(new WaitableEvent());

- m_updateEvent = adoptPtr(new WaitableEvent());

+ m_waitableEvent = wrapUnique(new WaitableEvent());

+ m_updateEvent = wrapUnique(new WaitableEvent());

postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::createHandle, this));

postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));

@@ -217,9 +219,9 @@ private:

m_reader = m_handle->obtainReader(&m_client);

}

- OwnPtr<WebDataConsumerHandle> m_handle;

+ std::unique_ptr<WebDataConsumerHandle> m_handle;

CrossThreadPersistent<CompositeDataConsumerHandle::Updater> m_updater;

- OwnPtr<WaitableEvent> m_updateEvent;

+ std::unique_ptr<WaitableEvent> m_updateEvent;

};

class ThreadingRegistrationUpdateTwiceAtOneTimeTest : public DataConsumerHandleTestUtil::ThreadingTestBase {

@@ -230,8 +232,8 @@ public:

void run()

{

ThreadHolder holder(this);

- m_waitableEvent = adoptPtr(new WaitableEvent());

- m_updateEvent = adoptPtr(new WaitableEvent());

+ m_waitableEvent = wrapUnique(new WaitableEvent());

+ m_updateEvent = wrapUnique(new WaitableEvent());

postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::createHandle, this));

postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));

@@ -263,9 +265,9 @@ private:

postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));

}

- OwnPtr<WebDataConsumerHandle> m_handle;

+ std::unique_ptr<WebDataConsumerHandle> m_handle;

CrossThreadPersistent<CompositeDataConsumerHandle::Updater> m_updater;

- OwnPtr<WaitableEvent> m_updateEvent;

+ std::unique_ptr<WaitableEvent> m_updateEvent;

};

TEST(CompositeDataConsumerHandleTest, Read)

@@ -275,10 +277,10 @@ TEST(CompositeDataConsumerHandleTest, Read)

DataConsumerHandleTestUtil::NoopClient client;

Checkpoint checkpoint;

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

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

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

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

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

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

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

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

InSequence s;

EXPECT_CALL(checkpoint, Call(0));

@@ -292,13 +294,13 @@ TEST(CompositeDataConsumerHandleTest, Read)

EXPECT_CALL(checkpoint, Call(4));

// They are adopted by |obtainReader|.

- ASSERT_TRUE(reader1.leakPtr());

- ASSERT_TRUE(reader2.leakPtr());

+ ASSERT_TRUE(reader1.release());

+ ASSERT_TRUE(reader2.release());

CompositeDataConsumerHandle::Updater* updater = nullptr;

- OwnPtr<WebDataConsumerHandle> handle = CompositeDataConsumerHandle::create(std::move(handle1), &updater);

+ std::unique_ptr<WebDataConsumerHandle> handle = CompositeDataConsumerHandle::create(std::move(handle1), &updater);

checkpoint.Call(0);

- OwnPtr<WebDataConsumerHandle::Reader> reader = handle->obtainReader(&client);

+ std::unique_ptr<WebDataConsumerHandle::Reader> reader = handle->obtainReader(&client);

checkpoint.Call(1);

EXPECT_EQ(kOk, reader->read(buffer, sizeof(buffer), kNone, &size));

checkpoint.Call(2);

@@ -314,10 +316,10 @@ TEST(CompositeDataConsumerHandleTest, TwoPhaseRead)

size_t size = 0;

Checkpoint checkpoint;

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

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

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

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

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

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

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

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

InSequence s;

EXPECT_CALL(checkpoint, Call(0));

@@ -335,13 +337,13 @@ TEST(CompositeDataConsumerHandleTest, TwoPhaseRead)

EXPECT_CALL(checkpoint, Call(6));

// They are adopted by |obtainReader|.

- ASSERT_TRUE(reader1.leakPtr());

- ASSERT_TRUE(reader2.leakPtr());

+ ASSERT_TRUE(reader1.release());

+ ASSERT_TRUE(reader2.release());

CompositeDataConsumerHandle::Updater* updater = nullptr;

- OwnPtr<WebDataConsumerHandle> handle = CompositeDataConsumerHandle::create(std::move(handle1), &updater);

+ std::unique_ptr<WebDataConsumerHandle> handle = CompositeDataConsumerHandle::create(std::move(handle1), &updater);

checkpoint.Call(0);

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

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

checkpoint.Call(1);

EXPECT_EQ(kOk, reader->beginRead(&p, kNone, &size));

checkpoint.Call(2);

@@ -361,12 +363,12 @@ TEST(CompositeDataConsumerHandleTest, HangingTwoPhaseRead)

size_t size = 0;

Checkpoint checkpoint;

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

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

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

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

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

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

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

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

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

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

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

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

InSequence s;

EXPECT_CALL(checkpoint, Call(0));

@@ -388,14 +390,14 @@ TEST(CompositeDataConsumerHandleTest, HangingTwoPhaseRead)

EXPECT_CALL(checkpoint, Call(8));

// They are adopted by |obtainReader|.

- ASSERT_TRUE(reader1.leakPtr());

- ASSERT_TRUE(reader2.leakPtr());

- ASSERT_TRUE(reader3.leakPtr());

+ ASSERT_TRUE(reader1.release());

+ ASSERT_TRUE(reader2.release());

+ ASSERT_TRUE(reader3.release());

CompositeDataConsumerHandle::Updater* updater = nullptr;

- OwnPtr<WebDataConsumerHandle> handle = CompositeDataConsumerHandle::create(std::move(handle1), &updater);

+ std::unique_ptr<WebDataConsumerHandle> handle = CompositeDataConsumerHandle::create(std::move(handle1), &updater);

checkpoint.Call(0);

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

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

checkpoint.Call(1);

EXPECT_EQ(kOk, reader->beginRead(&p, kNone, &size));

checkpoint.Call(2);