Moving DidFinishLoad from RenderView to RenderFrame.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6472aa02521ea1e94b6269cf9034f1bf3e040040..7355891a9f4755cd89ac7251d191e5279729289b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -457,7 +457,7 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
                         OnDidRunInsecureContent)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishDocumentLoad,
                         OnDocumentLoadedInFrame)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_DidFinishLoad, OnDidFinishLoad)
+    IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishLoad, OnDidFinishLoad)
     IPC_MESSAGE_HANDLER(ViewHostMsg_GoToEntryAtOffset, OnGoToEntryAtOffset)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateZoomLimits, OnUpdateZoomLimits)
     IPC_MESSAGE_HANDLER(ViewHostMsg_EnumerateDirectory, OnEnumerateDirectory)
@@ -2251,29 +2251,33 @@ void WebContentsImpl::OnDocumentLoadedInFrame() {
 }
 
 void WebContentsImpl::OnDidFinishLoad(
-    int64 frame_id,
     const GURL& url,
     bool is_main_frame) {
-  if (!render_view_message_source_) {
+  if (!render_frame_message_source_) {
     RecordAction(base::UserMetricsAction("BadMessageTerminate_RVD2"));
     GetRenderProcessHost()->ReceivedBadMessage();
     return;
   }
 
+  RenderFrameHostImpl* rfh =
+      static_cast<RenderFrameHostImpl*>(render_frame_message_source_);
+
   // --site-per-process mode has a short-term hack allowing cross-process
   // subframe pages to commit thinking they are top-level.  Correct it here to
   // avoid confusing the observers.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) &&
-      render_view_message_source_ != GetRenderViewHost())
+      rfh->render_view_host() != GetRenderViewHost()) {

[Charlie Reis, 2014/03/05 18:50:26]

Can we use rfh != GetMainFrame() here?

(Side note: I'm fine with adding braces here, but style doesn't require it for
multi-line conditionals as long as there's a one-line body and it's still
"readable.")

[nasko, 2014/03/05 19:00:46]

Yes, we can. Fixed.
On the style: since we have 3 levels of indentation on 3 lines of code, it makes
sense to me to be explicit.

     is_main_frame = false;
+  }
 
   GURL validated_url(url);
   RenderProcessHost* render_process_host =
-      render_view_message_source_->GetProcess();
+      render_frame_message_source_->GetProcess();
   render_process_host->FilterURL(false, &validated_url);
+
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
-                    DidFinishLoad(frame_id, validated_url, is_main_frame,
-                                  render_view_message_source_));
+                    DidFinishLoad(rfh->GetRoutingID(), validated_url,
+                                  is_main_frame, rfh->render_view_host()));
 }
 
 void WebContentsImpl::OnGoToEntryAtOffset(int offset) {