Move ownership of PowerSaveBlocker from WakeLockServiceContext to WakeLockServiceImpl

content/browser/frame_host/render_frame_host_delegate.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_DELEGATE_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_DELEGATE_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "build/build_config.h"
 #include "content/browser/webui/web_ui_impl.h"
 #include "content/common/content_export.h"
 #include "content/common/frame_message_enums.h"
 #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"
 
 #if defined(OS_WIN)
 #include "ui/gfx/native_widget_types.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
 #endif
 
 class GURL;
 
 namespace IPC {
 class Message;
 }
 
 namespace device {
 class GeolocationServiceContext;
-
-namespace mojom {
-class WakeLockContext;
-}
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace url {
 class Origin;
 }
 
@@ skipping 132 matching lines @@
 
   // Find a guest RenderFrameHost by its parent |render_frame_host| and
   // |browser_plugin_instance_id|.
   virtual RenderFrameHost* GetGuestByInstanceID(
       RenderFrameHost* render_frame_host,
       int browser_plugin_instance_id);
 
   // 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.
   virtual void EnterFullscreenMode(const GURL& origin) {}
 
   // Notification that the frame wants to go out of fullscreen mode.
   // |will_cause_resize| indicates whether the fullscreen change causes a
   // view resize. e.g. This will be false when going from tab fullscreen to
   // browser fullscreen.
   virtual void ExitFullscreenMode(bool will_cause_resize) {}
@@ skipping 95 matching lines @@
   GetJavaRenderFrameHostDelegate();
 #endif
 
  protected:
   virtual ~RenderFrameHostDelegate() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_DELEGATE_H_