Revert of Refactor DeviceMotionEventPump to use //device/generic_sensor instead of //device/sensors

services/device/device_service.cc

 // Copyright 2016 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 "services/device/device_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
+#include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/generic_sensor/sensor_provider_impl.h"
 #include "device/sensors/device_sensor_host.h"
 #include "device/wake_lock/wake_lock_provider.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/device/fingerprint/fingerprint.h"
 #include "services/device/power_monitor/power_monitor_message_broadcaster.h"
+#include "services/device/public/cpp/device_features.h"
 #include "services/device/public/interfaces/battery_monitor.mojom.h"
 #include "services/device/time_zone_monitor/time_zone_monitor.h"
 #include "services/service_manager/public/cpp/bind_source_info.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "jni/InterfaceRegistrar_jni.h"
 #include "services/device/android/register_jni.h"
 #include "services/device/screen_orientation/screen_orientation_listener_android.h"
@@ skipping 51 matching lines @@
 
 DeviceService::~DeviceService() {
 #if !defined(OS_ANDROID)
   device::BatteryStatusService::GetInstance()->Shutdown();
 #endif
 }
 
 void DeviceService::OnStart() {
   registry_.AddInterface<mojom::Fingerprint>(base::Bind(
       &DeviceService::BindFingerprintRequest, base::Unretained(this)));
+  registry_.AddInterface<mojom::MotionSensor>(base::Bind(
+      &DeviceService::BindMotionSensorRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::OrientationSensor>(base::Bind(
       &DeviceService::BindOrientationSensorRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::OrientationAbsoluteSensor>(
       base::Bind(&DeviceService::BindOrientationAbsoluteSensorRequest,
                  base::Unretained(this)));
   registry_.AddInterface<mojom::PowerMonitor>(base::Bind(
       &DeviceService::BindPowerMonitorRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::ScreenOrientationListener>(
       base::Bind(&DeviceService::BindScreenOrientationListenerRequest,
                  base::Unretained(this)));
-  registry_.AddInterface<mojom::SensorProvider>(base::Bind(
-      &DeviceService::BindSensorProviderRequest, base::Unretained(this)));
+  if (base::FeatureList::IsEnabled(features::kGenericSensor)) {
+    registry_.AddInterface<mojom::SensorProvider>(base::Bind(
+        &DeviceService::BindSensorProviderRequest, base::Unretained(this)));
+  }
   registry_.AddInterface<mojom::TimeZoneMonitor>(base::Bind(
       &DeviceService::BindTimeZoneMonitorRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::WakeLockProvider>(base::Bind(
       &DeviceService::BindWakeLockProviderRequest, base::Unretained(this)));
 
 #if defined(OS_ANDROID)
   registry_.AddInterface(GetJavaInterfaceProvider()
                              ->CreateInterfaceFactory<mojom::BatteryMonitor>());
   registry_.AddInterface(
       GetJavaInterfaceProvider()->CreateInterfaceFactory<mojom::NFCProvider>());
@@ skipping 38 matching lines @@
   VibrationManagerImpl::Create(std::move(request));
 }
 #endif
 
 void DeviceService::BindFingerprintRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::FingerprintRequest request) {
   Fingerprint::Create(std::move(request));
 }
 
+void DeviceService::BindMotionSensorRequest(
+    const service_manager::BindSourceInfo& source_info,
+    mojom::MotionSensorRequest request) {
+#if defined(OS_ANDROID)
+  // On Android the device sensors implementations need to run on the UI thread
+  // to communicate to Java.
+  DeviceMotionHost::Create(std::move(request));
+#else
+  // On platforms other than Android the device sensors implementations run on
+  // the IO thread.
+  if (io_task_runner_) {
+    io_task_runner_->PostTask(FROM_HERE, base::Bind(&DeviceMotionHost::Create,
+                                                    base::Passed(&request)));
+  }
+#endif  // defined(OS_ANDROID)
+}
+
 void DeviceService::BindOrientationSensorRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::OrientationSensorRequest request) {
 #if defined(OS_ANDROID)
   // On Android the device sensors implementations need to run on the UI thread
   // to communicate to Java.
   DeviceOrientationHost::Create(std::move(request));
 #else
   // On platforms other than Android the device sensors implementations run on
   // the IO thread.
@@ skipping 81 matching lines @@
     java_interface_provider_.Bind(std::move(provider));
 
     java_interface_provider_initialized_ = true;
   }
 
   return &java_interface_provider_;
 }
 #endif
 
 }  // namespace device