Device Service: Decouple Wake Lock from //content

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 0044460a1d9c1dd4bb4d99313ae24f2582b861bb..bc5fd45341e8d22cc503932e07a49a1b843a0982 100644
--- a/services/device/device_service.cc
+++ b/services/device/device_service.cc
@@ -13,6 +13,7 @@
 #include "services/device/time_zone_monitor/time_zone_monitor.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
+#include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
 #include "services/device/android/register_jni.h"
@@ -20,21 +21,36 @@
 
 namespace device {
 
-std::unique_ptr<service_manager::Service> CreateDeviceService(
-    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
 #if defined(OS_ANDROID)
+std::unique_ptr<service_manager::Service> CreateDeviceService(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    WakeLockContextCallback wake_lock_context_callback) {
   if (!EnsureJniRegistered()) {
     DLOG(ERROR) << "Failed to register JNI for Device Service";
     return nullptr;
   }
-#endif
 
+  return base::MakeUnique<DeviceService>(std::move(file_task_runner),
+                                         wake_lock_context_callback);
+}
+#else
+std::unique_ptr<service_manager::Service> CreateDeviceService(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
   return base::MakeUnique<DeviceService>(std::move(file_task_runner));
 }
+#endif
 
+#if defined(OS_ANDROID)
+DeviceService::DeviceService(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    WakeLockContextCallback wake_lock_context_callback)
+    : file_task_runner_(std::move(file_task_runner)),
+      wake_lock_context_callback_(wake_lock_context_callback) {}
+#else
 DeviceService::DeviceService(
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
     : file_task_runner_(std::move(file_task_runner)) {}
+#endif
 
 DeviceService::~DeviceService() {}
 
@@ -45,6 +61,7 @@ bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info,
   registry->AddInterface<mojom::Fingerprint>(this);
   registry->AddInterface<mojom::PowerMonitor>(this);
   registry->AddInterface<mojom::TimeZoneMonitor>(this);
+  registry->AddInterface<mojom::WakeLockServiceContext>(this);
   return true;
 }
 
@@ -69,4 +86,10 @@ void DeviceService::Create(const service_manager::Identity& remote_identity,
   time_zone_monitor_->Bind(std::move(request));
 }
 
+void DeviceService::Create(const service_manager::Identity& remote_identity,
+                           mojom::WakeLockServiceContextRequest request) {
+  new WakeLockServiceContext(std::move(request), file_task_runner_,
+                             wake_lock_context_callback_);
+}
+
 }  // namespace device