1 files changed, 8 insertions, 39 deletions
diff --git a/chromium/content/browser/device_sensors/device_orientation_message_filter.cc b/chromium/content/browser/device_sensors/device_orientation_message_filter.cc
index 63a9d6230f4..9b0aeb8b13a 100644
--- a/chromium/content/browser/device_sensors/device_orientation_message_filter.cc
+++ b/chromium/content/browser/device_sensors/device_orientation_message_filter.cc
@@ -4,61 +4,30 @@
 
 #include "content/browser/device_sensors/device_orientation_message_filter.h"
 
-#include "content/browser/device_sensors/device_inertial_sensor_service.h"
 #include "content/common/device_sensors/device_orientation_messages.h"
 
 namespace content {
 
 DeviceOrientationMessageFilter::DeviceOrientationMessageFilter()
-    : BrowserMessageFilter(DeviceOrientationMsgStart),
-      is_started_(false) {
-}
+    : DeviceSensorMessageFilter(CONSUMER_TYPE_ORIENTATION,
+                                DeviceOrientationMsgStart) {}
 
-DeviceOrientationMessageFilter::~DeviceOrientationMessageFilter() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (is_started_)
-    DeviceInertialSensorService::GetInstance()->RemoveConsumer(
-        CONSUMER_TYPE_ORIENTATION);
-}
+DeviceOrientationMessageFilter::~DeviceOrientationMessageFilter() {}
 
 bool DeviceOrientationMessageFilter::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DeviceOrientationMessageFilter, message)
-    IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StartPolling,
-                        OnDeviceOrientationStartPolling)
-    IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StopPolling,
-                        OnDeviceOrientationStopPolling)
+    IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StartPolling, OnStartPolling)
+    IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StopPolling, OnStopPolling)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void DeviceOrientationMessageFilter::OnDeviceOrientationStartPolling() {
-  DCHECK(!is_started_);
-  if (is_started_)
-    return;
-  is_started_ = true;
-  DeviceInertialSensorService::GetInstance()->AddConsumer(
-      CONSUMER_TYPE_ORIENTATION);
-  DidStartDeviceOrientationPolling();
-}
-
-void DeviceOrientationMessageFilter::OnDeviceOrientationStopPolling() {
-  DCHECK(is_started_);
-  if (!is_started_)
-    return;
-  is_started_ = false;
-  DeviceInertialSensorService::GetInstance()->RemoveConsumer(
-      CONSUMER_TYPE_ORIENTATION);
-}
-
-void DeviceOrientationMessageFilter::DidStartDeviceOrientationPolling() {
-  Send(new DeviceOrientationMsg_DidStartPolling(
-      DeviceInertialSensorService::GetInstance()->
-          GetSharedMemoryHandleForProcess(
-              CONSUMER_TYPE_ORIENTATION,
-              PeerHandle())));
+void DeviceOrientationMessageFilter::DidStartPolling(
+    base::SharedMemoryHandle handle) {
+  Send(new DeviceOrientationMsg_DidStartPolling(handle));
 }
 
 }  // namespace content