Device Service: Decouple Wake Lock from //content

services/device/device_service.h

Index: services/device/device_service.h
diff --git a/services/device/device_service.h b/services/device/device_service.h
index 69f3283e9d636f3097ed529fb3a5d4f745b8e829..8f6360aebb7520742011f705daff0f4c98a02618 100644
--- a/services/device/device_service.h
+++ b/services/device/device_service.h
@@ -6,6 +6,8 @@
 #define SERVICES_DEVICE_DEVICE_SERVICE_H_
 
 #include "base/memory/ref_counted.h"
+#include "device/wake_lock/public/interfaces/wake_lock_service_context.mojom.h"
+#include "device/wake_lock/wake_lock_service_context.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/device/public/interfaces/fingerprint.mojom.h"
 #include "services/device/public/interfaces/power_monitor.mojom.h"
@@ -18,16 +20,28 @@ namespace device {
 class PowerMonitorMessageBroadcaster;
 class TimeZoneMonitor;
 
+#if defined(OS_ANDROID)
+std::unique_ptr<service_manager::Service> CreateDeviceService(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    WakeLockContextCallback wake_lock_context_callback);
+#else
 std::unique_ptr<service_manager::Service> CreateDeviceService(
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
+#endif
 
 class DeviceService
     : public service_manager::Service,
       public service_manager::InterfaceFactory<mojom::Fingerprint>,
       public service_manager::InterfaceFactory<mojom::PowerMonitor>,
-      public service_manager::InterfaceFactory<mojom::TimeZoneMonitor> {
+      public service_manager::InterfaceFactory<mojom::TimeZoneMonitor>,
+      public service_manager::InterfaceFactory<mojom::WakeLockServiceContext> {
  public:
+#if defined(OS_ANDROID)
+  DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+                WakeLockContextCallback wake_lock_context_callback);
+#else
   DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
+#endif
   ~DeviceService() override;
 
  private:
@@ -48,12 +62,18 @@ class DeviceService
   void Create(const service_manager::Identity& remote_identity,
               mojom::TimeZoneMonitorRequest request) override;
 
+  // InterfaceFactory<mojom::WakeLockServiceContext>:
+  void Create(const service_manager::Identity& remote_identity,
+              mojom::WakeLockServiceContextRequest request) override;
+
   std::unique_ptr<device::PowerMonitorMessageBroadcaster>
       power_monitor_message_broadcaster_;
   std::unique_ptr<device::TimeZoneMonitor> time_zone_monitor_;
 
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
 
+  WakeLockContextCallback wake_lock_context_callback_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceService);
 };