Move routing to RenderFrameHost instead of RenderViewHost.

content/public/browser/render_frame_host.h

Index: content/public/browser/render_frame_host.h
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h
index a5a49f24ef25089fd218023b05f52bfa44abad7e..4512dfb287d49ecc22f7f4c1538c3a1661c2cdb7 100644
--- a/content/public/browser/render_frame_host.h
+++ b/content/public/browser/render_frame_host.h
@@ -11,9 +11,24 @@
 
 namespace content {
 
+class RenderViewHost;
+
 // The interface provides a communication conduit with a frame in the renderer.
 class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
                                        public IPC::Sender {
+ public:
+  // Returns the RenderFrameHost given its routing id and the id of its render
+  // process. Returns NULL if the ids do not correspond to a live
+  // RenderFrameHost.
+  static RenderFrameHost* FromID(int process_id, int routing_id);
+
+  virtual ~RenderFrameHost() {}
+
+  // Returns the RenderViewHost associated with this RenderFrameHost.
+  virtual RenderViewHost* GetRenderViewHost() const = 0;
+
+  virtual int GetRoutingID() const = 0;
+
  private:
   // This interface should only be implemented inside content.
   friend class RenderFrameHostImpl;