Revert of Change the battery-status layout tests to use JS mocks.

content/renderer/renderer_blink_platform_impl.cc

Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 921fbf46535a5af75843778055025876cd334d60..5e76b78b0c8f838aaddfac05f0bfc530cc666343 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1166,6 +1166,14 @@
 void RendererBlinkPlatformImpl::connectToRemoteService(
     const char* name,
     mojo::ScopedMessagePipeHandle handle) {
+  // In the layout test mode, mock services should be used instead.
+  // TODO(yukishiino): We'd like to inject mock services implemented in
+  // JavaScript.  Remove the following hack once we support JS-bindings
+  // of Mojo and service mocking in JS.
+  if (RenderThreadImpl::current() &&
+      RenderThreadImpl::current()->layout_test_mode())
+    return;
+
   RenderThread::Get()->GetServiceRegistry()->ConnectToRemoteService(
       name, std::move(handle));
 }