Revert of Replace Chrome IPC with Mojo IPC for querying BatteryStatus service

content/renderer/renderer_blink_platform_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_blink_platform_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 1027 matching lines @@
 // static
 PlatformEventObserverBase*
 RendererBlinkPlatformImpl::CreatePlatformEventObserverFromType(
     blink::WebPlatformEventType type) {
   RenderThread* thread = RenderThreadImpl::current();
 
   // When running layout tests, those observers should not listen to the actual
   // hardware changes. In order to make that happen, they will receive a null
   // thread.
   if (thread && RenderThreadImpl::current()->layout_test_mode())
-    thread = NULL;
+    thread = 0;
 
   switch (type) {
-    case blink::WebPlatformEventDeviceMotion:
-      return new DeviceMotionEventPump(thread);
-    case blink::WebPlatformEventDeviceOrientation:
-      return new DeviceOrientationEventPump(thread);
-    case blink::WebPlatformEventDeviceLight:
-      return new DeviceLightEventPump(thread);
-    case blink::WebPlatformEventGamepad:
-      return new GamepadSharedMemoryReader(thread);
-    case blink::WebPlatformEventScreenOrientation:
-      return new ScreenOrientationObserver();
-    default:
-      // A default statement is required to prevent compilation errors when
-      // Blink adds a new type.
-      VLOG(1) << "RendererBlinkPlatformImpl::startListening() with "
-                 "unknown type.";
+  case blink::WebPlatformEventDeviceMotion: {
+    return new DeviceMotionEventPump(thread);
+  }
+  case blink::WebPlatformEventDeviceOrientation: {
+    return new DeviceOrientationEventPump(thread);
+  }
+  case blink::WebPlatformEventDeviceLight: {
+    return new DeviceLightEventPump(thread);
+  }
+  case blink::WebPlatformEventBattery: {
+    return new BatteryStatusDispatcher(thread);
+  }
+  case blink::WebPlatformEventGamepad:
+    return new GamepadSharedMemoryReader(thread);
+    break;
+  case blink::WebPlatformEventScreenOrientation:
+    return new ScreenOrientationObserver();
+  default:
+    // A default statement is required to prevent compilation errors when Blink
+    // adds a new type.
+    VLOG(1) << "RendererBlinkPlatformImpl::startListening() with "
+               "unknown type.";
   }
 
-  return NULL;
+  return 0;
 }
 
 void RendererBlinkPlatformImpl::SetPlatformEventObserverForTesting(
     blink::WebPlatformEventType type,
     scoped_ptr<PlatformEventObserverBase> observer) {
-  DCHECK(type != blink::WebPlatformEventBattery);
-
   if (platform_event_observers_.Lookup(type))
     platform_event_observers_.Remove(type);
   platform_event_observers_.AddWithID(observer.release(), type);
 }
 
 void RendererBlinkPlatformImpl::startListening(
     blink::WebPlatformEventType type,
     blink::WebPlatformEventListener* listener) {
-  if (type == blink::WebPlatformEventBattery) {
-    battery_status_dispatcher_.reset(new BatteryStatusDispatcher(
-        static_cast<blink::WebBatteryStatusListener*>(listener)));
-    return;
-  }
-
   PlatformEventObserverBase* observer = platform_event_observers_.Lookup(type);
   if (!observer) {
     observer = CreatePlatformEventObserverFromType(type);
     if (!observer)
       return;
     platform_event_observers_.AddWithID(observer, static_cast<int32>(type));
   }
   observer->Start(listener);
 
   // Device events (motion, orientation and light) expect to get an event fired
@@ skipping 38 matching lines @@
     return;
 
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(&PlatformEventObserverBase::SendFakeDataForTesting,
                  base::Unretained(observer), data));
 }
 
 void RendererBlinkPlatformImpl::stopListening(
     blink::WebPlatformEventType type) {
-  if (type == blink::WebPlatformEventBattery) {
-    battery_status_dispatcher_.reset();
-    return;
-  }
-
   PlatformEventObserverBase* observer = platform_event_observers_.Lookup(type);
   if (!observer)
     return;
   observer->Stop();
 }
 
 //------------------------------------------------------------------------------
 
 void RendererBlinkPlatformImpl::queryStorageUsageAndQuota(
     const blink::WebURL& storage_partition,
@@ skipping 14 matching lines @@
 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
     const blink::WebBatteryStatus& status) {
   PlatformEventObserverBase* observer =
       platform_event_observers_.Lookup(blink::WebPlatformEventBattery);
   if (!observer)
     return;
   observer->SendFakeDataForTesting((void*)&status);
 }
 
 }  // namespace content