Move routing to RenderFrameHost instead of RenderViewHost.

content/browser/renderer_host/render_frame_host_impl.h

Index: content/browser/renderer_host/render_frame_host_impl.h
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index bb94c8e63c2cddfadfa6366a58468812ab2a1ff1..1fc818763d39044988b61c0ab8a43dd1a45a7b79 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -6,20 +6,30 @@
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include "base/compiler_specific.h"
+#include "base/containers/hash_tables.h"
+#include "base/lazy_instance.h"
 #include "content/public/browser/render_frame_host.h"
 
 namespace content {
 
+class RenderViewHost;
 class RenderViewHostImpl;
+class RenderFrameHostImpl;
 
 class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
  public:
+  static RenderFrameHostImpl* FromID(int process_id, int routing_id);
+
   RenderFrameHostImpl(
       RenderViewHostImpl* render_view_host,
       int routing_id,
       bool swapped_out);
   virtual ~RenderFrameHostImpl();
 
+  // RenderFrameHost methods
+  virtual RenderViewHost* GetRenderViewHost() const OVERRIDE;
+  virtual int GetRoutingID() const OVERRIDE;
+
   // IPC::Sender
   virtual bool Send(IPC::Message* msg) OVERRIDE;