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

Unified Diff: third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp

Issue 1740843002: Revert of Migrates battery_status from content/renderer/ to WebKit/platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/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 {

Powered by Google App Engine
This is Rietveld 408576698