Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(839)

Unified Diff: third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.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
Index: third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp b/third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp
index efb5391ae7c278c331b8a9069571599bd4fb8a8c..7b28ea9190ee5e162c0693ad86f4f07e6727fcce 100644
--- a/third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp
+++ b/third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp
@@ -5,13 +5,15 @@
#include "modules/fetch/DataConsumerHandleTestUtil.h"
#include "bindings/core/v8/DOMWrapperWorld.h"
+#include "wtf/PtrUtil.h"
+#include <memory>
namespace blink {
DataConsumerHandleTestUtil::Thread::Thread(const char* name, InitializationPolicy initializationPolicy)
: m_thread(WebThreadSupportingGC::create(name))
, m_initializationPolicy(initializationPolicy)
- , m_waitableEvent(adoptPtr(new WaitableEvent()))
+ , m_waitableEvent(wrapUnique(new WaitableEvent()))
{
m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&Thread::initialize, AllowCrossThreadAccess(this)));
m_waitableEvent->wait();
@@ -26,7 +28,7 @@ DataConsumerHandleTestUtil::Thread::~Thread()
void DataConsumerHandleTestUtil::Thread::initialize()
{
if (m_initializationPolicy >= ScriptExecution) {
- m_isolateHolder = adoptPtr(new gin::IsolateHolder());
+ m_isolateHolder = wrapUnique(new gin::IsolateHolder());
isolate()->Enter();
}
m_thread->initialize();
@@ -165,7 +167,7 @@ DataConsumerHandleTestUtil::ReplayingHandle::Context::Context()
, m_client(nullptr)
, m_result(ShouldWait)
, m_isHandleAttached(true)
- , m_detached(adoptPtr(new WaitableEvent()))
+ , m_detached(wrapUnique(new WaitableEvent()))
{
}
@@ -229,7 +231,7 @@ void DataConsumerHandleTestUtil::ReplayingHandle::add(const Command& command)
m_context->add(command);
}
-DataConsumerHandleTestUtil::HandleReader::HandleReader(PassOwnPtr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
+DataConsumerHandleTestUtil::HandleReader::HandleReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
: m_reader(handle->obtainReader(this))
, m_onFinishedReading(std::move(onFinishedReading))
{
@@ -248,20 +250,20 @@ void DataConsumerHandleTestUtil::HandleReader::didGetReadable()
break;
m_data.append(buffer, size);
}
- OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data));
+ std::unique_ptr<HandleReadResult> result = wrapUnique(new HandleReadResult(r, m_data));
m_data.clear();
- Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, bind(&HandleReader::runOnFinishedReading, this, passed(std::move(result))));
+ Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, WTF::bind(&HandleReader::runOnFinishedReading, this, passed(std::move(result))));
m_reader = nullptr;
}
-void DataConsumerHandleTestUtil::HandleReader::runOnFinishedReading(PassOwnPtr<HandleReadResult> result)
+void DataConsumerHandleTestUtil::HandleReader::runOnFinishedReading(std::unique_ptr<HandleReadResult> result)
{
ASSERT(m_onFinishedReading);
std::unique_ptr<OnFinishedReading> onFinishedReading(std::move(m_onFinishedReading));
(*onFinishedReading)(std::move(result));
}
-DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(PassOwnPtr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
+DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
: m_reader(handle->obtainReader(this))
, m_onFinishedReading(std::move(onFinishedReading))
{
@@ -283,13 +285,13 @@ void DataConsumerHandleTestUtil::HandleTwoPhaseReader::didGetReadable()
m_data.append(static_cast<const char*>(buffer), readSize);
m_reader->endRead(readSize);
}
- OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data));
+ std::unique_ptr<HandleReadResult> result = wrapUnique(new HandleReadResult(r, m_data));
m_data.clear();
- Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, bind(&HandleTwoPhaseReader::runOnFinishedReading, this, passed(std::move(result))));
+ Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, WTF::bind(&HandleTwoPhaseReader::runOnFinishedReading, this, passed(std::move(result))));
m_reader = nullptr;
}
-void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(PassOwnPtr<HandleReadResult> result)
+void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(std::unique_ptr<HandleReadResult> result)
{
ASSERT(m_onFinishedReading);
std::unique_ptr<OnFinishedReading> onFinishedReading(std::move(m_onFinishedReading));

Powered by Google App Engine
This is Rietveld 408576698