Migrates battery_status from content/renderer/ to WebKit/platform/

third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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)
 {
 }
 
 TestingDiscardableMemory::~TestingDiscardableMemory()
 {
 }
 
@@ skipping 49 matching lines @@
 WebString TestingPlatformSupport::defaultLocale()
 {
     return WebString::fromUTF8("en-US");
 }
 
 WebCompositorSupport* TestingPlatformSupport::compositorSupport()
 {
     return m_config.compositorSupport;
 }
 
+WebThread* TestingPlatformSupport::currentThread()
+{
+    return m_oldPlatform ? m_oldPlatform->currentThread() : nullptr;
+}
+
 WebUnitTestSupport* TestingPlatformSupport::unitTestSupport()
 {
     return m_oldPlatform ? m_oldPlatform->unitTestSupport() : nullptr;
 }
 
-WebThread* TestingPlatformSupport::currentThread()
+void TestingPlatformSupport::connectToRemoteService(const char* name, mojo::ScopedMessagePipeHandle handle)
 {
-    return m_oldPlatform ? m_oldPlatform->currentThread() : nullptr;
+#if !OS(ANDROID)

[haraken, 2016/02/09 12:01:21]

I'm just curious: Why do we need !OS(ANDROID)?

[Yuki, 2016/02/12 12:36:14]

On Android, BatteryMonitor is implemented in Java.  There is no C++
implementation.

See
https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/re...
and
https://code.google.com/p/chromium/codesearch#chromium/src/device/battery/BUI...

+    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 {
     WTF_MAKE_NONCOPYABLE(TestingPlatformMockWebTaskRunner);
 public:
     explicit TestingPlatformMockWebTaskRunner(Deque<OwnPtr<WebTaskRunner::Task>>* tasks) : m_tasks(tasks) { }
     ~TestingPlatformMockWebTaskRunner() override { }
 
     void postTask(const WebTraceLocation&, Task* task) override
     {
@@ skipping 91 matching lines @@
 {
     return m_mockWebThread.get();
 }
 
 TestingPlatformMockScheduler* TestingPlatformSupportWithMockScheduler::mockWebScheduler()
 {
     return m_mockWebThread->mockWebScheduler();
 }
 
 } // namespace blink