TabContentsWrapper -> TabContents, part 13.

chrome/browser/ui/tabs/tab_finder.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/ui/tabs/tab_finder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 56 matching lines @@
 }
 
 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.
-  WebContents* selected_tab = browser->GetSelectedWebContents();
+  WebContents* selected_tab = browser->GetActiveWebContents();
   if (TabMatchesURL(selected_tab, url))
     return NULL;
 
   // See if the current browser has a tab matching the specified url.
   WebContents* tab_in_browser = FindTabInBrowser(browser, url);
   if (tab_in_browser) {
     *existing_browser = browser;
     return tab_in_browser;
   }
 
@@ skipping 12 matching lines @@
 
   return NULL;
 }
 
 void TabFinder::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_TAB_PARENTED);
 
   // The tab was added to a browser. Query for its state now.
-  TabContentsWrapper* tab = content::Source<TabContentsWrapper>(source).ptr();
+  TabContents* tab = content::Source<TabContents>(source).ptr();
   TrackTab(tab->web_contents());
 }
 
 TabFinder::TabFinder() {
   registrar_.Add(this, chrome::NOTIFICATION_TAB_PARENTED,
                  content::NotificationService::AllSources());
 }
 
 TabFinder::~TabFinder() {
   STLDeleteElements(&tab_contents_observers_);
@@ skipping 98 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();
   }
 }