Move routing to RenderFrameHost instead of RenderViewHost.

content/browser/renderer_host/render_frame_host_impl.cc

Index: content/browser/renderer_host/render_frame_host_impl.cc
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index ea511d0b8c38d14a376281979fa7989e66ca3e51..29f115e4f2635c6006f20be1ffc011659f68ee34 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8,15 +8,51 @@
 
 namespace content {
 
+typedef std::pair<int32, int32> RenderFrameHostID;
+typedef base::hash_map<RenderFrameHostID, RenderFrameHostImpl*>
+    RoutingIDFrameMap;
+static base::LazyInstance<RoutingIDFrameMap> g_routing_id_frame_map =
+    LAZY_INSTANCE_INITIALIZER;
+
+// static
+RenderFrameHost* RenderFrameHost::FromID(int process_id, int routing_id) {
+  return RenderFrameHostImpl::FromID(process_id, routing_id);
+}
+
+// static
+RenderFrameHostImpl* RenderFrameHostImpl::FromID(
+    int process_id, int routing_id) {
+  RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer();
+  RoutingIDFrameMap::iterator it = frames->find(
+      RenderFrameHostID(process_id, routing_id));
+  return it == frames->end() ? NULL : it->second;
+}
+
 RenderFrameHostImpl::RenderFrameHostImpl(
     RenderViewHostImpl* render_view_host,
     int routing_id,
     bool swapped_out)
     : render_view_host_(render_view_host),
       routing_id_(routing_id) {
+  render_view_host_->GetProcess()->AddRoute(routing_id_, this);
+  g_routing_id_frame_map.Get().insert(std::make_pair(
+      RenderFrameHostID(render_view_host_->GetProcess()->GetID(), routing_id_),
+      this));
 }
 
 RenderFrameHostImpl::~RenderFrameHostImpl() {
+  render_view_host_->GetProcess()->RemoveRoute(routing_id_);
+  g_routing_id_frame_map.Get().erase(
+      RenderFrameHostID(render_view_host_->GetProcess()->GetID(), routing_id_));
+
+}
+
+RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() const {
+  return render_view_host_;
+}
+
+int RenderFrameHostImpl::GetRoutingID() const {
+  return routing_id_;
 }
 
 bool RenderFrameHostImpl::Send(IPC::Message* message) {