Device Service: Decouple Wake Lock from //content

content/public/browser/web_contents.h

Index: content/public/browser/web_contents.h
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 5a509ef831b9a4278909e212dd8b5ac1558e563b..f79676506ba9149a1933d050cf977485dbc10171 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -188,6 +188,9 @@ class WebContents : public PageNavigator,
 
   CONTENT_EXPORT static WebContents* FromRenderFrameHost(RenderFrameHost* rfh);
 
+  // Returns the WebContents associated with |id|.
+  CONTENT_EXPORT static WebContents* FromId(int id);

[blundell, 2017/03/07 20:41:15]

If we stick with this approach, I'll modify this to avoid adding this into the
WebContents interface (where it presumably would not be at all desired) and
instead will make a WakeLockServiceContextHost class that is owned by
WebContents and does the mapping.

+
   // Returns the WebContents associated with the |frame_tree_node_id|.
   CONTENT_EXPORT static WebContents* FromFrameTreeNodeId(
       int frame_tree_node_id);
@@ -200,6 +203,9 @@ class WebContents : public PageNavigator,
 
   // Intrinsic tab state -------------------------------------------------------
 
+  // Gets the globally-unique ID associated with this WebContents.
+  virtual int GetId() = 0;
+
   // Gets/Sets the delegate.
   virtual WebContentsDelegate* GetDelegate() = 0;
   virtual void SetDelegate(WebContentsDelegate* delegate) = 0;