Expose RenderFrameHost::GetGlobalFrameRoutingId

Storing a GlobalFrameRoutingId is the preferred method of keeping a
reference to a RenderFrameHost

Change-Id: I70266e1e7e5d7c9863df43e300c26a1e7b82e563
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2449389Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813801}

content/browser/renderer_host/render_frame_host_impl.h

@@ -290,6 +290,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
   ui::AXTreeID GetAXTreeID() override;
   SiteInstanceImpl* GetSiteInstance() override;
   RenderProcessHost* GetProcess() override;
+  GlobalFrameRoutingId GetGlobalFrameRoutingId() override;
   RenderWidgetHostView* GetView() override;
   RenderFrameHostImpl* GetParent() override;
   RenderFrameHostImpl* GetMainFrame() override;
@@ -664,8 +665,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // typically mean that the frame has been detached from the frame tree.
   virtual RenderWidgetHostImpl* GetRenderWidgetHost();
 
-  GlobalFrameRoutingId GetGlobalFrameRoutingId();
-
   media::MediaMetricsProvider::RecordAggregateWatchTimeCallback
   GetRecordAggregateWatchTimeCallback();
 

content/public/browser/render_frame_host.h

@@ -148,6 +148,10 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
   // Associated RenderProcessHost never changes.
   virtual RenderProcessHost* GetProcess() = 0;
 
+  // Returns the GlobalFrameRoutingId for this frame. Embedders should store
+  // this instead of a raw RenderFrameHost pointer.
+  virtual GlobalFrameRoutingId GetGlobalFrameRoutingId() = 0;
+
   // Returns a StoragePartition associated with this RenderFrameHost.
   // Associated StoragePartition never changes.
   virtual StoragePartition* GetStoragePartition() = 0;