| 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 4248588cfaa6e4a2c37a5774cb5856119577817b..72b6eb38059fd9e270bf3f30e6dc76ce32f6ac68 100644
|
| --- a/third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandleTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandleTest.cpp
|
| @@ -62,8 +62,8 @@ public:
|
| ThreadHolder holder(this);
|
| m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
|
|
|
| - postTaskToUpdatingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| - postTaskToReadingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| + postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| + postTaskToReadingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| }
|
|
|
| private:
|
| @@ -77,14 +77,14 @@ private:
|
| void obtainReader()
|
| {
|
| m_reader = m_handle->obtainReader(&m_client);
|
| - postTaskToUpdatingThread(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| + postTaskToUpdatingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| }
|
| void update()
|
| {
|
| m_updater->update(DataConsumerHandle::create("handle2", m_context));
|
| m_updater.clear();
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| }
|
|
|
| OwnPtr<WebDataConsumerHandle> m_handle;
|
| @@ -101,8 +101,8 @@ public:
|
| ThreadHolder holder(this);
|
| m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
|
|
|
| - postTaskToUpdatingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| - postTaskToReadingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| + postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| + postTaskToReadingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| }
|
|
|
| private:
|
| @@ -117,15 +117,15 @@ private:
|
| void obtainReader()
|
| {
|
| m_reader = m_handle->obtainReader(&m_client);
|
| - postTaskToUpdatingThread(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| + postTaskToUpdatingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| }
|
| void update()
|
| {
|
| m_updater->update(DataConsumerHandle::create("handle2", m_context));
|
| m_updater.clear();
|
| m_handle = nullptr;
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| }
|
|
|
| OwnPtr<WebDataConsumerHandle> m_handle;
|
| @@ -142,8 +142,8 @@ public:
|
| ThreadHolder holder(this);
|
| m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
|
|
|
| - postTaskToUpdatingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| - postTaskToReadingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| + postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| + postTaskToReadingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| }
|
|
|
| private:
|
| @@ -158,15 +158,15 @@ private:
|
| void obtainReader()
|
| {
|
| m_reader = m_handle->obtainReader(&m_client);
|
| - postTaskToUpdatingThread(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| + postTaskToUpdatingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| }
|
| void update()
|
| {
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| m_updater->update(DataConsumerHandle::create("handle2", m_context));
|
| m_updater.clear();
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| }
|
|
|
| OwnPtr<WebDataConsumerHandle> m_handle;
|
| @@ -184,8 +184,8 @@ public:
|
| m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
|
| m_updateEvent = adoptPtr(Platform::current()->createWaitableEvent());
|
|
|
| - postTaskToUpdatingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| - postTaskToReadingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| + postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| + postTaskToReadingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| }
|
|
|
| private:
|
| @@ -200,17 +200,17 @@ private:
|
| void obtainReader()
|
| {
|
| m_reader = m_handle->obtainReader(&m_client);
|
| - postTaskToUpdatingThread(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| + postTaskToUpdatingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| m_updateEvent->wait();
|
| }
|
|
|
| void update()
|
| {
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::reobtainReader, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::reobtainReader, this)));
|
| m_updater->update(DataConsumerHandle::create("handle2", m_context));
|
| m_updater.clear();
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| m_updateEvent->signal();
|
| }
|
|
|
| @@ -236,8 +236,8 @@ public:
|
| m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
|
| m_updateEvent = adoptPtr(Platform::current()->createWaitableEvent());
|
|
|
| - postTaskToUpdatingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| - postTaskToReadingThreadAndWait(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| + postTaskToUpdatingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
|
| + postTaskToReadingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
|
| }
|
|
|
| private:
|
| @@ -252,7 +252,7 @@ private:
|
| void obtainReader()
|
| {
|
| m_reader = m_handle->obtainReader(&m_client);
|
| - postTaskToUpdatingThread(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| + postTaskToUpdatingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
|
| // Stalls this thread while updating handles.
|
| m_updateEvent->wait();
|
| }
|
| @@ -262,8 +262,8 @@ private:
|
| m_updater->update(DataConsumerHandle::create("handle3", m_context));
|
| m_updateEvent->signal();
|
| m_updater.clear();
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| - postTaskToReadingThread(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
|
| + postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
|
| }
|
|
|
| OwnPtr<WebDataConsumerHandle> m_handle;
|
|
|