Convert remaining WebContentsObservers loading callbacks to use RFH.

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 222 matching lines @@
       has_stopped_loading_(false),
       has_finished_loading_(false),
       final_status_(FINAL_STATUS_MAX),
       match_complete_status_(MATCH_COMPLETE_DEFAULT),
       prerendering_has_been_cancelled_(false),
       child_id_(-1),
       route_id_(-1),
       origin_(origin),
       experiment_id_(experiment_id),
       creator_child_id_(-1),
-      main_frame_id_(0),
       cookie_status_(0),
       cookie_send_type_(COOKIE_SEND_TYPE_NONE),
       network_bytes_(0) {
   DCHECK(prerender_manager != NULL);
 }
 
 PrerenderContents* PrerenderContents::CreateMatchCompleteReplacement() {
   PrerenderContents* new_contents = prerender_manager_->CreatePrerenderContents(
       prerender_url(), referrer(), origin(), experiment_id());
 
@@ skipping 359 matching lines @@
       render_frame_host->GetRoutingID(), true));
 }
 
 void PrerenderContents::DidStopLoading(
     content::RenderViewHost* render_view_host) {
   has_stopped_loading_ = true;
   NotifyPrerenderStopLoading();
 }
 
 void PrerenderContents::DocumentLoadedInFrame(
-    int64 frame_id,
-    RenderViewHost* render_view_host) {
-  if (frame_id == main_frame_id_)
+    content::RenderFrameHost* render_frame_host) {
+  if (!render_frame_host->GetParent())
     NotifyPrerenderDomContentLoaded();
 }
 
 void PrerenderContents::DidStartProvisionalLoadForFrame(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url,
     bool is_error_page,
     bool is_iframe_srcdoc) {
   if (!render_frame_host->GetParent()) {
     if (!CheckURL(validated_url))
       return;
 
     // Usually, this event fires if the user clicks or enters a new URL.
     // Neither of these can happen in the case of an invisible prerender.
     // So the cause is: Some JavaScript caused a new URL to be loaded.  In that
     // case, the spinner would start again in the browser, so we must reset
     // has_stopped_loading_ so that the spinner won't be stopped.
     has_stopped_loading_ = false;
     has_finished_loading_ = false;
   }
 }
 
-void PrerenderContents::DidCommitProvisionalLoadForFrame(
+void PrerenderContents::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
-    const GURL& url,
-    content::PageTransition transition_type) {
-  if (!render_frame_host->GetParent()) {
-    main_frame_id_ = render_frame_host->GetRoutingID();
-  }
-}
-
-void PrerenderContents::DidFinishLoad(int64 frame_id,
-                                      const GURL& validated_url,
-                                      bool is_main_frame,
-                                      RenderViewHost* render_view_host) {
-  if (is_main_frame)
+    const GURL& validated_url) {
+  if (!render_frame_host->GetParent())
     has_finished_loading_ = true;
 }
 
 void PrerenderContents::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // If the prerender made a second navigation entry, abort the prerender. This
   // avoids having to correctly implement a complex history merging case (this
   // interacts with location.replace) and correctly synchronize with the
   // renderer. The final status may be monitored to see we need to revisit this
@@ skipping 226 matching lines @@
  void PrerenderContents::AddResourceThrottle(
      const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
    resource_throttles_.push_back(throttle);
  }
 
  void PrerenderContents::AddNetworkBytes(int64 bytes) {
    network_bytes_ += bytes;
  }
 
 }  // namespace prerender