Move ownership of PowerSaveBlocker from WakeLockServiceContext to WakeLockServiceImpl

content/browser/frame_host/render_frame_host_delegate.h

Index: content/browser/frame_host/render_frame_host_delegate.h
diff --git a/content/browser/frame_host/render_frame_host_delegate.h b/content/browser/frame_host/render_frame_host_delegate.h
index 120e18ed8357f4fdc6a55d8a2cd7b884c29404d3..edfb478599993282c6e6b5ed6637afd86f647601 100644
--- a/content/browser/frame_host/render_frame_host_delegate.h
+++ b/content/browser/frame_host/render_frame_host_delegate.h
@@ -18,6 +18,7 @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/javascript_dialog_type.h"
 #include "content/public/common/media_stream_request.h"
+#include "device/wake_lock/public/interfaces/wake_lock_service.mojom.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "net/http/http_response_headers.h"
 #include "ui/base/window_open_disposition.h"
@@ -38,10 +39,6 @@ class Message;
 
 namespace device {
 class GeolocationServiceContext;
-
-namespace mojom {
-class WakeLockContext;
-}
 }
 
 namespace gfx {
@@ -194,8 +191,10 @@ class CONTENT_EXPORT RenderFrameHostDelegate {
   // Gets the GeolocationServiceContext associated with this delegate.
   virtual device::GeolocationServiceContext* GetGeolocationServiceContext();
 
-  // Gets the WakeLockServiceContext associated with this delegate.
-  virtual device::mojom::WakeLockContext* GetWakeLockServiceContext();
+  // Bind the WakeLockServiceRequests from blink to the WakeLockServiceImpl
+  // instance.
+  virtual void ConnectToBlinkWakeLock(

[blundell, 2017/05/02 11:27:43]

nit: On seeing this, I'm inclined to have the interface instead be

// Gets the WakeLockService that services wake lock requests from the //
renderer.
WakeLockService* GetRendererWakeLock();

and move the AddClient() calls to RenderFrameHostImpl. I think that will make
what's happening slightly more transparent.

[ke.he, 2017/05/04 11:54:13]

Done.

+      device::mojom::WakeLockServiceRequest request);
 
   // Notification that the frame wants to go into fullscreen mode.
   // |origin| represents the origin of the frame that requests fullscreen.