Move most of the remaining users of WebContentsObserver::tab_contents() to use web_contents().

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2011 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 <utility>
 
 #include "base/process_util.h"
@@ skipping 20 matching lines @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/mach_broker_mac.h"
 #endif
 
 using content::DownloadItem;
+using content::WebContents;
 
 namespace prerender {
 
 namespace {
 
 // Compares URLs ignoring any ref for the purposes of matching URLs when
 // prerendering.
 struct PrerenderURLPredicate {
   explicit PrerenderURLPredicate(const GURL& url)
       : url_(url) {
@@ skipping 272 matching lines @@
                               content::Source<Profile>(profile_));
 
   // Register to inform new RenderViews that we're prerendering.
   notification_registrar_.Add(
       this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
       content::Source<TabContents>(new_contents));
 
   // Register for redirect notifications sourced from |this|.
   notification_registrar_.Add(
       this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
-      content::Source<RenderViewHostDelegate>(GetRenderViewHostDelegate()));
+      content::Source<WebContents>(GetWebContents()));
 
   // Register for new windows from any source.
   notification_registrar_.Add(
       this, content::NOTIFICATION_CREATING_NEW_WINDOW_CANCELLED,
       content::Source<TabContents>(new_contents));
 
   DCHECK(load_start_time_.is_null());
   load_start_time_ = base::TimeTicks::Now();
 
   content::PageTransition transition = content::PAGE_TRANSITION_LINK;
@@ skipping 73 matching lines @@
     case content::NOTIFICATION_APP_TERMINATING:
       Destroy(FINAL_STATUS_APP_TERMINATING);
       return;
 
     case content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT: {
       // RESOURCE_RECEIVED_REDIRECT can come for any resource on a page.
       // If it's a redirect on the top-level resource, the name needs
       // to be remembered for future matching, and if it redirects to
       // an https resource, it needs to be canceled. If a subresource
       // is redirected, nothing changes.
-      DCHECK(content::Source<RenderViewHostDelegate>(source).ptr() ==
-             GetRenderViewHostDelegate());
+      DCHECK(content::Source<WebContents>(source).ptr() == GetWebContents());
       ResourceRedirectDetails* resource_redirect_details =
           content::Details<ResourceRedirectDetails>(details).ptr();
       CHECK(resource_redirect_details);
       if (resource_redirect_details->resource_type() ==
           ResourceType::MAIN_FRAME) {
         if (!AddAliasURL(resource_redirect_details->new_url()))
           return;
       }
       break;
     }
@@ skipping 213 matching lines @@
   }
 }
 
 TabContentsWrapper* PrerenderContents::ReleasePrerenderContents() {
   prerender_contents_->tab_contents()->SetDelegate(NULL);
   render_view_host_observer_.reset();
   content::WebContentsObserver::Observe(NULL);
   return prerender_contents_.release();
 }
 
-RenderViewHostDelegate* PrerenderContents::GetRenderViewHostDelegate() {
+WebContents* PrerenderContents::GetWebContents() {
   if (!prerender_contents_.get())
     return NULL;
   return prerender_contents_->tab_contents();
 }
 
 RenderViewHost* PrerenderContents::render_view_host_mutable() {
   return const_cast<RenderViewHost*>(render_view_host());
 }
 
 const RenderViewHost* PrerenderContents::render_view_host() const {
@@ skipping 21 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->tab_contents())
     return false;
   const TabContents* tab_contents = prerender_contents_->tab_contents();
   return (tab_contents->GetSiteInstance() !=
           tab_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender