| Index: third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| index 59c482c9733463128cc1df492f8fc8abb46940cc..60edb545378773813cac6f8cba1c360d8f554530 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| @@ -26,11 +26,11 @@
|
| #include "platform/graphics/ImageFrameGenerator.h"
|
|
|
| #include "platform/SharedBuffer.h"
|
| -#include "platform/Task.h"
|
| #include "platform/ThreadSafeFunctional.h"
|
| #include "platform/graphics/ImageDecodingStore.h"
|
| #include "platform/graphics/test/MockImageDecoder.h"
|
| #include "public/platform/Platform.h"
|
| +#include "public/platform/WebTaskRunner.h"
|
| #include "public/platform/WebThread.h"
|
| #include "public/platform/WebTraceLocation.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -198,7 +198,7 @@ TEST_F(ImageFrameGeneratorTest, incompleteDecodeBecomesCompleteMultiThreaded)
|
| data = m_generator->refEncodedData();
|
| EXPECT_EQ(nullptr, data);
|
| OwnPtr<WebThread> thread = adoptPtr(Platform::current()->createThread("DecodeThread"));
|
| - thread->taskRunner()->postTask(BLINK_FROM_HERE, new Task(threadSafeBind(&decodeThreadMain, AllowCrossThreadAccess(m_generator.get()))));
|
| + thread->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&decodeThreadMain, AllowCrossThreadAccess(m_generator.get())));
|
| thread.clear();
|
| EXPECT_EQ(2, m_decodeRequestCount);
|
| EXPECT_EQ(1, m_decodersDestroyed);
|
| @@ -215,7 +215,7 @@ TEST_F(ImageFrameGeneratorTest, incompleteDecodeBecomesCompleteMultiThreaded)
|
|
|
| // Thread will also ref and unref the data.
|
| thread = adoptPtr(Platform::current()->createThread("RefEncodedDataThread"));
|
| - thread->taskRunner()->postTask(BLINK_FROM_HERE, new Task(threadSafeBind(&decodeThreadWithRefEncodedMain, AllowCrossThreadAccess(m_generator.get()))));
|
| + thread->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&decodeThreadWithRefEncodedMain, AllowCrossThreadAccess(m_generator.get())));
|
| thread.clear();
|
| EXPECT_EQ(4, m_decodeRequestCount);
|
|
|
|
|