Port device_sensors to be hosted in Device Service

services/device/device_service.cc

Index: services/device/device_service.cc
diff --git a/services/device/device_service.cc b/services/device/device_service.cc
index 7a225c43c71cd0408c5566605184f2d8626a7bfa..e7c7709b3a65457e6a9da49c6ce0b045b02ebfa0 100644
--- a/services/device/device_service.cc
+++ b/services/device/device_service.cc
@@ -8,6 +8,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "device/sensors/device_sensor_host.h"
 #include "services/device/power_monitor/power_monitor_message_broadcaster.h"
 #include "services/device/time_zone_monitor/time_zone_monitor.h"
 #include "services/service_manager/public/cpp/connection.h"
@@ -20,7 +21,8 @@
 namespace device {
 
 std::unique_ptr<service_manager::Service> CreateDeviceService(
-    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) {
 #if defined(OS_ANDROID)
   if (!EnsureJniRegistered()) {
     DLOG(ERROR) << "Failed to register JNI for Device Service";
@@ -28,12 +30,15 @@ std::unique_ptr<service_manager::Service> CreateDeviceService(
   }
 #endif
 
-  return base::MakeUnique<DeviceService>(std::move(file_task_runner));
+  return base::MakeUnique<DeviceService>(std::move(file_task_runner),
+                                         std::move(io_task_runner));
 }
 
 DeviceService::DeviceService(
-    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
-    : file_task_runner_(std::move(file_task_runner)) {}
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
+    : file_task_runner_(std::move(file_task_runner)),
+      io_task_runner_(std::move(io_task_runner)) {}
 
 DeviceService::~DeviceService() {}
 
@@ -41,12 +46,82 @@ void DeviceService::OnStart() {}
 
 bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info,
                               service_manager::InterfaceRegistry* registry) {
+  registry->AddInterface<mojom::LightSensor>(this);
+  registry->AddInterface<mojom::MotionSensor>(this);
+  registry->AddInterface<mojom::OrientationSensor>(this);
+  registry->AddInterface<mojom::OrientationAbsoluteSensor>(this);
   registry->AddInterface<mojom::PowerMonitor>(this);
   registry->AddInterface<mojom::TimeZoneMonitor>(this);
   return true;
 }
 
 void DeviceService::Create(const service_manager::Identity& remote_identity,
+                           mojom::LightSensorRequest request) {
+#if defined(OS_ANDROID)
+  // On Android the device sensors implementations need to run on the UI thread
+  // to communicate to Java.
+  DeviceLightHost::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(&DeviceLightHost::Create,
+                                                    base::Passed(&request)));
+  }
+#endif  // defined(OS_ANDROID)
+}
+
+void DeviceService::Create(const service_manager::Identity& remote_identity,
+                           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,

[blundell, 2017/02/20 15:45:31]

Could you add an explanation in the CL description of how this new threading /
interface registration structure preserves the behavior that was present in
//content?

[ke.he, 2017/02/21 09:34:04]

Done.

+                                                    base::Passed(&request)));
+  }
+#endif  // defined(OS_ANDROID)
+}
+
+void DeviceService::Create(const service_manager::Identity& remote_identity,
+                           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.
+  if (io_task_runner_) {
+    io_task_runner_->PostTask(
+        FROM_HERE,
+        base::Bind(&DeviceOrientationHost::Create, base::Passed(&request)));
+  }
+#endif  // defined(OS_ANDROID)
+}
+
+void DeviceService::Create(const service_manager::Identity& remote_identity,
+                           mojom::OrientationAbsoluteSensorRequest request) {
+#if defined(OS_ANDROID)
+  // On Android the device sensors implementations need to run on the UI thread
+  // to communicate to Java.
+  DeviceOrientationAbsoluteHost::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(&DeviceOrientationAbsoluteHost::Create,
+                                         base::Passed(&request)));
+  }
+#endif  // defined(OS_ANDROID)
+}
+
+void DeviceService::Create(const service_manager::Identity& remote_identity,
                            mojom::PowerMonitorRequest request) {
   PowerMonitorMessageBroadcaster::Create(std::move(request));
 }