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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 147887d18781bbbc8e3b4f22b6b06883dfbc0b18..add48b86c4aba804f6b950b02e13bf8157e6b2c5 100644
--- a/third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp
+++ b/third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp
@@ -42,7 +42,7 @@ DataConsumerHandleTestUtil::Thread::Thread(
: m_thread(
WebThreadSupportingGC::create(name, BlinkGC::MainThreadHeapMode)),
m_initializationPolicy(initializationPolicy),
- m_waitableEvent(makeUnique<WaitableEvent>()) {
+ m_waitableEvent(WTF::makeUnique<WaitableEvent>()) {
m_thread->postTask(
BLINK_FROM_HERE,
crossThreadBind(&Thread::initialize, crossThreadUnretained(this)));
@@ -58,7 +58,7 @@ DataConsumerHandleTestUtil::Thread::~Thread() {
void DataConsumerHandleTestUtil::Thread::initialize() {
if (m_initializationPolicy >= ScriptExecution) {
- m_isolateHolder = makeUnique<gin::IsolateHolder>();
+ m_isolateHolder = WTF::makeUnique<gin::IsolateHolder>();
isolate()->Enter();
}
m_thread->initialize();
@@ -195,7 +195,7 @@ DataConsumerHandleTestUtil::ReplayingHandle::Context::Context()
m_client(nullptr),
m_result(ShouldWait),
m_isHandleAttached(true),
- m_detached(makeUnique<WaitableEvent>()) {}
+ m_detached(WTF::makeUnique<WaitableEvent>()) {}
const DataConsumerHandleTestUtil::Command&
DataConsumerHandleTestUtil::ReplayingHandle::Context::top() {
@@ -246,7 +246,7 @@ DataConsumerHandleTestUtil::ReplayingHandle::~ReplayingHandle() {
std::unique_ptr<WebDataConsumerHandle::Reader>
DataConsumerHandleTestUtil::ReplayingHandle::obtainReader(Client* client) {
- return makeUnique<ReaderImpl>(m_context, client);
+ return WTF::makeUnique<ReaderImpl>(m_context, client);
}
void DataConsumerHandleTestUtil::ReplayingHandle::add(const Command& command) {
@@ -273,12 +273,12 @@ void DataConsumerHandleTestUtil::HandleReader::didGetReadable() {
m_data.append(buffer, size);
}
std::unique_ptr<HandleReadResult> result =
- makeUnique<HandleReadResult>(r, m_data);
+ WTF::makeUnique<HandleReadResult>(r, m_data);
m_data.clear();
Platform::current()->currentThread()->getWebTaskRunner()->postTask(
BLINK_FROM_HERE,
WTF::bind(&HandleReader::runOnFinishedReading, WTF::unretained(this),
- passed(std::move(result))));
+ WTF::passed(std::move(result))));
m_reader = nullptr;
}
@@ -313,12 +313,12 @@ void DataConsumerHandleTestUtil::HandleTwoPhaseReader::didGetReadable() {
m_reader->endRead(readSize);
}
std::unique_ptr<HandleReadResult> result =
- makeUnique<HandleReadResult>(r, m_data);
+ WTF::makeUnique<HandleReadResult>(r, m_data);
m_data.clear();
Platform::current()->currentThread()->getWebTaskRunner()->postTask(
BLINK_FROM_HERE,
WTF::bind(&HandleTwoPhaseReader::runOnFinishedReading,
- WTF::unretained(this), passed(std::move(result))));
+ WTF::unretained(this), WTF::passed(std::move(result))));
m_reader = nullptr;
}
@@ -332,7 +332,7 @@ void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(
std::unique_ptr<WebDataConsumerHandle>
DataConsumerHandleTestUtil::createWaitingDataConsumerHandle() {
- return wrapUnique(new WaitingHandle);
+ return WTF::wrapUnique(new WaitingHandle);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698