Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/tabs/tab_finder.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/tabs/tab_finder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 63 matching lines @@
 TabFinder* TabFinder::GetInstance() {
   return IsEnabled() ? Singleton<TabFinder>::get() : NULL;
 }
 
 // static
 bool TabFinder::IsEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kFocusExistingTabOnOpen);
 }
 
-TabContents* TabFinder::FindTab(Browser* browser,
+WebContents* TabFinder::FindTab(Browser* browser,
                                 const GURL& url,
                                 Browser** existing_browser) {
   if (browser->profile()->IsOffTheRecord())
     return NULL;
 
   // If the current tab matches the url, ignore it and let the user reload the
   // existing tab.
-  TabContents* selected_tab = browser->GetSelectedTabContents();
+  WebContents* selected_tab = browser->GetSelectedWebContents();
   if (TabMatchesURL(selected_tab, url))
     return NULL;
 
   // See if the current browser has a tab matching the specified url.
-  TabContents* tab_in_browser = FindTabInBrowser(browser, url);
+  WebContents* tab_in_browser = FindTabInBrowser(browser, url);
   if (tab_in_browser) {
     *existing_browser = browser;
     return tab_in_browser;
   }
 
   // Then check other browsers.
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end(); ++i) {
     if (!(*i)->profile()->IsOffTheRecord() &&
          (*i)->profile()->IsSameProfile(browser->profile())) {
@@ skipping 44 matching lines @@
 
 bool TabFinder::TabMatchesURL(WebContents* tab_contents, const GURL& url) {
   if (tab_contents->GetURL() == url)
     return true;
 
   WebContentsToURLMap::const_iterator i =
       web_contents_to_url_.find(tab_contents);
   return i != web_contents_to_url_.end() && i->second == url;
 }
 
-TabContents* TabFinder::FindTabInBrowser(Browser* browser, const GURL& url) {
+WebContents* TabFinder::FindTabInBrowser(Browser* browser, const GURL& url) {
   if (!browser->is_type_tabbed())
     return NULL;
 
   for (int i = 0; i < browser->tab_count(); ++i) {
     if (TabMatchesURL(browser->GetTabContentsAt(i), url))
       return browser->GetTabContentsAt(i);
   }
   return NULL;
 }
 
@@ skipping 61 matching lines @@
                                          GURL url,
                                          bool success,
                                          history::RedirectList* redirects) {
   if (success && !redirects->empty()) {
     WebContents* web_contents =
         callback_consumer_.GetClientDataForCurrentRequest();
     DCHECK(web_contents);
     web_contents_to_url_[web_contents] = redirects->back();
   }
 }