Remove WebContentsImpl::OnDidRedirectProvisionalLoad.

chrome/browser/prerender/prerender_tab_helper.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_tab_helper.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "chrome/browser/prerender/prerender_histograms.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
 
 using content::WebContents;
 
 namespace prerender {
 
@@ skipping 115 matching lines @@
 
   base::WeakPtrFactory<PixelStats> weak_factory_;
 
   PrerenderTabHelper* tab_helper_;
 };
 
 PrerenderTabHelper::PrerenderTabHelper(TabContentsWrapper* tab)
     : content::WebContentsObserver(tab->web_contents()),
       pixel_stats_(new PixelStats(this)),
       tab_(tab) {
+  notification_registrar_.Add(
+        this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
+        content::Source<content::WebContents>(web_contents()));
 }
 
 PrerenderTabHelper::~PrerenderTabHelper() {
 }
 
-void PrerenderTabHelper::ProvisionalChangeToMainFrameUrl(
-    const GURL& url,
-    const GURL& opener_url,
-    content::RenderViewHost* render_view_host) {
-  url_ = url;
-  RecordPageviewEvent(PAGEVIEW_EVENT_NEW_URL);
-  if (IsTopSite(url))
-    RecordPageviewEvent(PAGEVIEW_EVENT_TOP_SITE_NEW_URL);
-  PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
-  if (!prerender_manager)
-    return;
-  if (prerender_manager->IsWebContentsPrerendering(web_contents()))
-    return;
-  prerender_manager->MarkWebContentsAsNotPrerendered(web_contents());
-}
-
 void PrerenderTabHelper::DidCommitProvisionalLoadForFrame(
     int64 frame_id,
     bool is_main_frame,
     const GURL& validated_url,
     content::PageTransition transition_type,
     content::RenderViewHost* render_view_host) {
   if (!is_main_frame)
     return;
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
@@ skipping 87 matching lines @@
     pplt_load_start_ = base::TimeTicks::Now();
     pixel_stats_->GetBitmap(PixelStats::BITMAP_SWAP_IN, web_contents());
   }
 }
 
 bool PrerenderTabHelper::IsTopSite(const GURL& url) {
   PrerenderManager* pm = MaybeGetPrerenderManager();
   return (pm && pm->IsTopSite(url));
 }
 
+void PrerenderTabHelper::HandleResourceReceivedRedirect(const GURL& new_url) {

[cbentzel, 2012/05/17 18:52:05]

Nit: the definitions should be ordered in same way as declarations in the
header. This helper may be in the right place, but Observe no longer is. Of
course, I think it makes sense if Observe is moved to private section and then
you will be OK.

+  url_ = new_url;
+  RecordPageviewEvent(PAGEVIEW_EVENT_NEW_URL);
+  if (IsTopSite(url_))
+    RecordPageviewEvent(PAGEVIEW_EVENT_TOP_SITE_NEW_URL);
+  PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
+  if (!prerender_manager)
+    return;
+  if (prerender_manager->IsWebContentsPrerendering(web_contents()))
+    return;
+  prerender_manager->MarkWebContentsAsNotPrerendered(web_contents());
+ }

[cbentzel, 2012/05/17 18:52:05]

Nit: this needs to be outdented by 1

+
+void PrerenderTabHelper::Observe(
+      int type,
+      const content::NotificationSource& source,
+      const content::NotificationDetails& details) {
+  switch (type) {
+    case content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT: {
+      DCHECK(content::Source<content::WebContents>(source).ptr() ==
+            web_contents());
+      content::ResourceRedirectDetails* resource_redirect_details =
+            content::Details<content::ResourceRedirectDetails>(details).ptr();
+      CHECK(resource_redirect_details);
+      HandleResourceReceivedRedirect(resource_redirect_details->new_url);
+      break;
+    }
+
+    default:
+      NOTREACHED() << "Unexpected notification sent.";
+      break;
+  }
+}
+
 }  // namespace prerender