Move ownership of PowerSaveBlocker from WakeLockServiceContext to WakeLockServiceImpl

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 927e4b41797f0537c0a55c8b17d0181d8ede2e24..79dbe359a478c458258954f95980753b73242b03 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -44,7 +44,7 @@
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/resource_type.h"
 #include "content/public/common/three_d_api_types.h"
-#include "device/wake_lock/public/interfaces/wake_lock_context.mojom.h"
+#include "device/wake_lock/public/interfaces/wake_lock_service.mojom.h"
 #include "net/base/load_states.h"
 #include "net/http/http_response_headers.h"
 #include "ppapi/features/features.h"
@@ -510,7 +510,9 @@ class CONTENT_EXPORT WebContentsImpl
       RenderFrameHost* render_frame_host,
       int browser_plugin_instance_id) override;
   device::GeolocationServiceContext* GetGeolocationServiceContext() override;
-  device::mojom::WakeLockContext* GetWakeLockServiceContext() override;
+  device::mojom::WakeLockContext* GetWakeLockContext() override;
+  void ConnectToBlinkWakeLock(
+      device::mojom::WakeLockServiceRequest request) override;
   void EnterFullscreenMode(const GURL& origin) override;
   void ExitFullscreenMode(bool will_cause_resize) override;
   bool ShouldRouteMessageEvent(
@@ -1513,6 +1515,8 @@ class CONTENT_EXPORT WebContentsImpl
 
   std::unique_ptr<WakeLockContextHost> wake_lock_context_host_;
 
+  device::mojom::WakeLockServicePtr blink_wake_lock_;

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

nit: let's name this |renderer_wake_lock_| actually.

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

Done.

+
   std::unique_ptr<ScreenOrientationProvider> screen_orientation_provider_;
 
   std::unique_ptr<ManifestManagerHost> manifest_manager_host_;