| Index: third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
|
| diff --git a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
|
| index 198e2777d7e8df2513dbac63fb14311d04010248..53124475f3965b3e22e798aa6829cb1b1d68600f 100644
|
| --- a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
|
| +++ b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp
|
| @@ -30,12 +30,6 @@
|
|
|
| #include "platform/testing/TestingPlatformSupport.h"
|
|
|
| -#if !OS(ANDROID)
|
| -#include "device/battery/battery_monitor_impl.h"
|
| -#endif
|
| -
|
| -#include <cstring>
|
| -
|
| namespace blink {
|
|
|
| TestingDiscardableMemory::TestingDiscardableMemory(size_t size) : m_data(size), m_isLocked(true)
|
| @@ -105,27 +99,14 @@
|
| return m_config.compositorSupport;
|
| }
|
|
|
| +WebUnitTestSupport* TestingPlatformSupport::unitTestSupport()
|
| +{
|
| + return m_oldPlatform ? m_oldPlatform->unitTestSupport() : nullptr;
|
| +}
|
| +
|
| WebThread* TestingPlatformSupport::currentThread()
|
| {
|
| return m_oldPlatform ? m_oldPlatform->currentThread() : nullptr;
|
| -}
|
| -
|
| -WebUnitTestSupport* TestingPlatformSupport::unitTestSupport()
|
| -{
|
| - return m_oldPlatform ? m_oldPlatform->unitTestSupport() : nullptr;
|
| -}
|
| -
|
| -void TestingPlatformSupport::connectToRemoteService(const char* name, mojo::ScopedMessagePipeHandle handle)
|
| -{
|
| -#if !OS(ANDROID)
|
| - if (std::strcmp(name, device::BatteryMonitor::Name_) == 0) {
|
| - device::BatteryMonitorImpl::Create(
|
| - mojo::MakeRequest<device::BatteryMonitor>(std::move(handle)));
|
| - return;
|
| - }
|
| -#endif
|
| -
|
| - ASSERT_NOT_REACHED();
|
| }
|
|
|
| class TestingPlatformMockWebTaskRunner : public WebTaskRunner {
|
|
|