Move routing to RenderFrameHost instead of RenderViewHost.

content/browser/loader/render_view_host_tracker.cc

Index: content/browser/loader/render_view_host_tracker.cc
diff --git a/content/browser/loader/render_view_host_tracker.cc b/content/browser/loader/render_view_host_tracker.cc
index 2f006e8e990aa47df9f45adaf42be82a61aea791..13430bf0da6e9961543f85b061b48d44b57a418b 100644
--- a/content/browser/loader/render_view_host_tracker.cc
+++ b/content/browser/loader/render_view_host_tracker.cc
@@ -8,7 +8,9 @@
 #include "base/stl_util.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_scheduler.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 
@@ -34,11 +36,20 @@ void RenderViewHostTracker::RenderViewHostCreated(RenderViewHost* rvh) {
 
   int child_id = rvh->GetProcess()->GetID();
   int route_id = rvh->GetRoutingID();
+
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated,
                  base::Unretained(ResourceDispatcherHostImpl::Get()),
                  child_id, route_id));
+
+  RenderFrameHost* rfh =
+      static_cast<RenderViewHostImpl*>(rvh)->main_render_frame_host();
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated,
+                 base::Unretained(ResourceDispatcherHostImpl::Get()),
+                 child_id, rfh->GetRoutingID()));
 }
 
 void RenderViewHostTracker::RemoveObserver(Observer* observer) {
@@ -68,6 +79,15 @@ void RenderViewHostTracker::Observer::RenderViewHostDestroyed(
                  base::Unretained(ResourceDispatcherHostImpl::Get()),
                  child_id, route_id));
 
+  RenderFrameHost* rfh =
+      static_cast<RenderViewHostImpl*>(rvh)->main_render_frame_host();
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostDeleted,
+                 base::Unretained(ResourceDispatcherHostImpl::Get()),
+                 child_id, rfh->GetRoutingID()));
+
+
   tracker_->RemoveObserver(this);
 }