TabContentsWrapper -> TabContents, part 56.

That's almost all.

BUG=131026
TEST=no change

Review URL: https://chromiumcodereview.appspot.com/10551002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141891 0039d316-1c4b-4281-b951-d872f2087c98

39 files changed, 109 insertions, 160 deletions

diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc
index dcac721..981bf0b 100644
--- a/chrome/browser/accessibility/accessibility_extension_api.cc
+++ b/chrome/browser/accessibility/accessibility_extension_api.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.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/extensions/extension_error_utils.h"
 #include "content/public/browser/notification_service.h"
@@ -197,7 +197,7 @@ bool GetAlertsForTabFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id));
 
   TabStripModel* tab_strip = NULL;
-  TabContentsWrapper* contents = NULL;
+  TabContents* contents = NULL;
   int tab_index = -1;
   if (!ExtensionTabUtil::GetTabById(tab_id, profile(), include_incognito(),
                                     NULL, &tab_strip, &contents, &tab_index)) {
diff --git a/chrome/browser/accessibility/accessibility_extension_apitest.cc b/chrome/browser/accessibility/accessibility_extension_apitest.cc
index eb200ec..158e58a 100644
--- a/chrome/browser/accessibility/accessibility_extension_apitest.cc
+++ b/chrome/browser/accessibility/accessibility_extension_apitest.cc
@@ -7,11 +7,11 @@
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetAlertsForTab) {
-  TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();
+  TabContents* tab = browser()->GetActiveTabContents();
   ASSERT_TRUE(tab);
   InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
 
diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc
index fdf3ff6..c7a9720 100644
--- a/chrome/browser/accessibility/accessibility_win_browsertest.cc
+++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc
@@ -210,10 +210,10 @@ void RecursiveFindNodeInAccessibilityTree(
 IAccessible*
 AccessibilityWinBrowserTest::GetRendererAccessible() {
   content::RenderViewHostTester::EnableAccessibilityUpdatedNotifications(
-      browser()->GetSelectedWebContents()->GetRenderViewHost());
+      browser()->GetActiveWebContents()->GetRenderViewHost());
 
   HWND hwnd_render_widget_host_view =
-      browser()->GetSelectedWebContents()->GetRenderWidgetHostView()->
+      browser()->GetActiveWebContents()->GetRenderWidgetHostView()->
           GetNativeView();
 
   // Invoke windows screen reader detection by sending the WM_GETOBJECT message
@@ -233,7 +233,7 @@ AccessibilityWinBrowserTest::GetRendererAccessible() {
 }
 
 void AccessibilityWinBrowserTest::ExecuteScript(wstring script) {
-  browser()->GetSelectedWebContents()->GetRenderViewHost()->
+  browser()->GetActiveWebContents()->GetRenderViewHost()->
       ExecuteJavascriptInWebFrame(L"", script);
 }
 
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index e1c8d42..8be03fd 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -66,7 +66,6 @@ class Notification;
 class Profile;
 class SavePackage;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 class TranslateInfoBarDelegate;
 
 namespace automation {
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
index ff2e804..bd8e6a7 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
@@ -51,7 +51,7 @@ class RegisterProtocolHandlerBrowserTest : public InProcessBrowserTest {
     params.media_type = WebKit::WebContextMenuData::MediaTypeNone;
     params.link_url = url;
     params.unfiltered_link_url = url;
-    WebContents* web_contents = browser()->GetSelectedWebContents();
+    WebContents* web_contents = browser()->GetActiveWebContents();
     params.page_url = web_contents->GetController().GetActiveEntry()->GetURL();
 #if defined(OS_MACOSX)
     params.writing_direction_default = 0;
@@ -59,7 +59,7 @@ class RegisterProtocolHandlerBrowserTest : public InProcessBrowserTest {
     params.writing_direction_right_to_left = 0;
 #endif  // OS_MACOSX
     TestRenderViewContextMenu* menu = new TestRenderViewContextMenu(
-        browser()->GetSelectedWebContents(), params);
+        browser()->GetActiveWebContents(), params);
     menu->Init();
     return menu;
   }
@@ -107,5 +107,5 @@ IN_PROC_BROWSER_TEST_F(RegisterProtocolHandlerBrowserTest, CustomHandler) {
 
   ui_test_utils::NavigateToURL(browser(), GURL("foo:test"));
 
-  ASSERT_EQ(handler_url, browser()->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(handler_url, browser()->GetActiveWebContents()->GetURL());
 }
diff --git a/chrome/browser/extensions/extension_install_ui_android.h b/chrome/browser/extensions/extension_install_ui_android.h
index eb207ad..5d36f38 100644
--- a/chrome/browser/extensions/extension_install_ui_android.h
+++ b/chrome/browser/extensions/extension_install_ui_android.h
@@ -8,9 +8,6 @@
 
 #include "chrome/browser/extensions/extension_install_ui.h"
 
-class InfoBarDelegate;
-class TabContentsWrapper;
-
 class ExtensionInstallUIAndroid : public ExtensionInstallUI {
  public:
   ExtensionInstallUIAndroid();
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 91ebc1a..d384638 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -513,7 +513,7 @@ void FirstRunBubbleLauncher::Observe(
     return;
   }
 
-  content::WebContents* contents = browser->GetSelectedWebContents();
+  content::WebContents* contents = browser->GetActiveWebContents();
   if (contents && contents->GetURL().SchemeIs(chrome::kChromeUIScheme)) {
     // Suppress the first run bubble if the sync promo is showing.
     if (contents->GetURL().host() == chrome::kChromeUISyncPromoHost)
diff --git a/chrome/browser/net/load_timing_observer_browsertest.cc b/chrome/browser/net/load_timing_observer_browsertest.cc
index aee531b..2fb2bb6 100644
--- a/chrome/browser/net/load_timing_observer_browsertest.cc
+++ b/chrome/browser/net/load_timing_observer_browsertest.cc
@@ -29,7 +29,7 @@ IN_PROC_BROWSER_TEST_F(LoadTimingObserverTest, FLAKY_CacheHitAfterRedirect) {
   int response_start = 0;
   int response_end = 0;
   content::RenderViewHost* render_view_host =
-      browser()->GetSelectedWebContents()->GetRenderViewHost();
+      browser()->GetActiveWebContents()->GetRenderViewHost();
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
       render_view_host, L"",
       L"window.domAutomationController.send("
diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc
index 4585ffa..c6d5bb0 100644
--- a/chrome/browser/page_cycler/page_cycler.cc
+++ b/chrome/browser/page_cycler/page_cycler.cc
@@ -29,7 +29,7 @@ using content::WebContents;
 
 PageCycler::PageCycler(Browser* browser,
                        const FilePath& urls_file)
-    : content::WebContentsObserver(browser->GetSelectedWebContents()),
+    : content::WebContentsObserver(browser->GetActiveWebContents()),
       browser_(browser),
       urls_file_(urls_file),
       url_index_(0),
@@ -132,7 +132,7 @@ void PageCycler::BeginCycle() {
   // result in the browser being in a state of loading when PageCycler is ready
   // to start. Instead of interrupting the load, we wait for it to finish, and
   // will call LoadNextURL() from DidFinishLoad() or DidFailProvisionalLoad().
-  if (browser_->GetSelectedWebContents()->IsLoading())
+  if (browser_->GetActiveWebContents()->IsLoading())
     return;
   LoadNextURL();
 }
diff --git a/chrome/browser/page_cycler/page_cycler_unittest.cc b/chrome/browser/page_cycler/page_cycler_unittest.cc
index 45c2089..98c10d9 100644
--- a/chrome/browser/page_cycler/page_cycler_unittest.cc
+++ b/chrome/browser/page_cycler/page_cycler_unittest.cc
@@ -109,7 +109,7 @@ class PageCyclerTest : public BrowserWithTestWindowTest {
 
     BrowserWithTestWindowTest::SetUp();
     AddTab(browser(), kAboutURL);
-    ASSERT_FALSE(browser()->GetSelectedWebContents() == NULL);
+    ASSERT_FALSE(browser()->GetActiveWebContents() == NULL);
   }
 
   void InitFilePaths(const FilePath& temp_path) {
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index cb89237..c21d5ab 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 172eac8..c48dc8c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -373,7 +373,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
   }
 
   bool ShowingInterstitialPage() {
-    WebContents* contents = browser()->GetSelectedWebContents();
+    WebContents* contents = browser()->GetActiveWebContents();
     InterstitialPage* interstitial_page = contents->GetInterstitialPage();
     return interstitial_page != NULL;
   }
diff --git a/chrome/browser/sync/glue/synced_tab_delegate.h b/chrome/browser/sync/glue/synced_tab_delegate.h
index 56faeb2..363d532 100644
--- a/chrome/browser/sync/glue/synced_tab_delegate.h
+++ b/chrome/browser/sync/glue/synced_tab_delegate.h
@@ -19,19 +19,19 @@ class NavigationEntry;
 namespace browser_sync {
 
 // A SyncedTabDelegate is used to insulate the sync code from depending
-// directly on WebContents, TabContentsWrapper and NavigationController.
+// directly on WebContents, TabContents and NavigationController.
 class SyncedTabDelegate {
  public:
   virtual ~SyncedTabDelegate() {}
 
-  // Method from TabContentsWrapper.
+  // Method from TabContents.
 
   virtual SessionID::id_type GetWindowId() const = 0;
   virtual SessionID::id_type GetSessionId() const = 0;
   virtual bool IsBeingDestroyed() const = 0;
   virtual Profile* profile() const = 0;
 
-  // Method derived from TabContentsWrapper.
+  // Method derived from TabContents.
 
   virtual bool HasExtensionAppId() const = 0;
   virtual const std::string& GetExtensionAppId() const = 0;
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 92ddcf00..280a418 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1061,11 +1061,6 @@ int Browser::GetIndexOfController(
   return tab_strip_model_->GetIndexOfController(controller);
 }
 
-// DEPRECATED
-TabContents* Browser::GetSelectedTabContentsWrapper() const {
-  return GetActiveTabContents();
-}
-
 TabContents* Browser::GetActiveTabContents() const {
   return tab_strip_model_->GetActiveTabContents();
 }
@@ -1080,11 +1075,6 @@ WebContents* Browser::GetActiveWebContents() const {
   return tab_contents ? tab_contents->web_contents() : NULL;
 }
 
-// DEPRECATED
-TabContents* Browser::GetTabContentsWrapperAt(int index) const {
-  return GetTabContentsAt(index);
-}
-
 TabContents* Browser::GetTabContentsAt(int index) const {
   return tab_strip_model_->GetTabContentsAt(index);
 }
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 0ee3a9e..4348e05 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -401,13 +401,11 @@ class Browser : public TabStripModelDelegate,
   int GetIndexOfController(
       const content::NavigationController* controller) const;
 
-  TabContents* GetSelectedTabContentsWrapper() const;  // DEPRECATED
   TabContents* GetActiveTabContents() const;
   // A convenient version of the above which returns the TabContents's
   // WebContents.
   content::WebContents* GetSelectedWebContents() const;  // DEPRECATED
   content::WebContents* GetActiveWebContents() const;
-  TabContents* GetTabContentsWrapperAt(int index) const;  // DEPRECATED
   TabContents* GetTabContentsAt(int index) const;
   // A convenient version of the above which returns the TabContents's
   // WebContents.
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index b246942..1549013 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -583,9 +583,9 @@ class OmniboxViewTest : public InProcessBrowserTest,
     ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, ui::EF_CONTROL_DOWN,
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
-            &browser()->GetSelectedWebContents()->GetController())));
+            &browser()->GetActiveWebContents()->GetController())));
 
-    GURL url = browser()->GetSelectedWebContents()->GetURL();
+    GURL url = browser()->GetActiveWebContents()->GetURL();
     EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str());
   }
 
@@ -619,8 +619,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
     ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0,
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
-            &browser()->GetSelectedWebContents()->GetController())));
-    GURL url = browser()->GetSelectedWebContents()->GetURL();
+            &browser()->GetActiveWebContents()->GetController())));
+    GURL url = browser()->GetActiveWebContents()->GetURL();
     EXPECT_STREQ(kSearchTextURL, url.spec().c_str());
 
     // Test that entering a single character then Enter performs a search.
@@ -639,8 +639,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
     ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0,
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
-            &browser()->GetSelectedWebContents()->GetController())));
-    url = browser()->GetSelectedWebContents()->GetURL();
+            &browser()->GetActiveWebContents()->GetController())));
+    url = browser()->GetActiveWebContents()->GetURL();
     EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str());
   }
 
diff --git a/chrome/browser/ui/panels/old_base_panel_browser_test.cc b/chrome/browser/ui/panels/old_base_panel_browser_test.cc
index 662878d..75c58f3 100644
--- a/chrome/browser/ui/panels/old_base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/old_base_panel_browser_test.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/ui/panels/panel_browser_window.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.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_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -398,9 +398,8 @@ Panel* OldBasePanelBrowserTest::CreateDetachedPanel(const std::string& name,
 }
 
 void OldBasePanelBrowserTest::CreateTestTabContents(Browser* browser) {
-  TabContentsWrapper* tab_contents =
-      new TabContentsWrapper(
-          WebContentsTester::CreateTestWebContents(browser->profile(), NULL));
+  TabContents* tab_contents = new TabContents(
+      WebContentsTester::CreateTestWebContents(browser->profile(), NULL));
   browser->AddTab(tab_contents, content::PAGE_TRANSITION_LINK);
 }
 
diff --git a/chrome/browser/ui/panels/old_panel_browsertest.cc b/chrome/browser/ui/panels/old_panel_browsertest.cc
index 024285e..48d2031 100644
--- a/chrome/browser/ui/panels/old_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_browsertest.cc
@@ -1409,12 +1409,11 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
   EXPECT_EQ(2U, BrowserList::size());
 
   // Swap tab contents over to the panel from the tabbed browser.
-  TabContentsWrapper* contents =
-      browser()->tab_strip_model()->DetachTabContentsAt(0);
+  TabContents* contents = browser()->tab_strip_model()->DetachTabContentsAt(0);
   panel_browser->tab_strip_model()->InsertTabContentsAt(
       0, contents, TabStripModel::ADD_NONE);
   panel_browser->SelectNumberedTab(0);
-  EXPECT_EQ(contents, panel_browser->GetSelectedTabContentsWrapper());
+  EXPECT_EQ(contents, panel_browser->GetActiveTabContents());
   EXPECT_EQ(1, PanelManager::GetInstance()->num_panels());
 
   // Ensure that the tab contents were noticed by the panel by
@@ -1425,7 +1424,7 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(panel));
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
-      panel_browser->GetSelectedWebContents()->GetRenderViewHost(),
+      panel_browser->GetActiveWebContents()->GetRenderViewHost(),
       std::wstring(),
       L"changeSize(50);"));
   enlarge.Wait();
@@ -1440,7 +1439,7 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
   EXPECT_EQ(0, PanelManager::GetInstance()->num_panels());
 
   Browser* tabbed_browser = browser::FindTabbedBrowser(profile, false);
-  EXPECT_EQ(contents, tabbed_browser->GetSelectedTabContentsWrapper());
+  EXPECT_EQ(contents, tabbed_browser->GetActiveTabContents());
   tabbed_browser->window()->Close();
 }
 
diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc
index bbeed83..bcc5c95 100644
--- a/chrome/browser/ui/pdf/pdf_browsertest.cc
+++ b/chrome/browser/ui/pdf/pdf_browsertest.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/snapshot_tab_helper.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_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -83,12 +83,12 @@ class PDFBrowserTest : public InProcessBrowserTest,
   void VerifySnapshot(const std::string& expected_filename) {
     snapshot_different_ = true;
     expected_filename_ = expected_filename;
-    TabContentsWrapper* wrapper =  browser()->GetSelectedTabContentsWrapper();
-    wrapper->snapshot_tab_helper()->CaptureSnapshot();
+    TabContents* tab_contents =  browser()->GetActiveTabContents();
+    tab_contents->snapshot_tab_helper()->CaptureSnapshot();
     ui_test_utils::RegisterAndWait(
         this,
         chrome::NOTIFICATION_TAB_SNAPSHOT_TAKEN,
-        content::Source<WebContents>(wrapper->web_contents()));
+        content::Source<WebContents>(tab_contents->web_contents()));
     ASSERT_FALSE(snapshot_different_) << "Rendering didn't match, see result "
         "at " << snapshot_filename_.value().c_str();
   }
@@ -107,7 +107,7 @@ class PDFBrowserTest : public InProcessBrowserTest,
     string16 query = UTF8ToUTF16(
         std::string("xyzxyz" + base::IntToString(next_dummy_search_value_++)));
     ASSERT_EQ(0, ui_test_utils::FindInPage(
-        browser()->GetSelectedTabContentsWrapper(), query, true, false, NULL));
+        browser()->GetActiveTabContents(), query, true, false, NULL));
   }
 
  private:
@@ -237,13 +237,13 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Scroll) {
   wheel_event.type = WebKit::WebInputEvent::MouseWheel;
   wheel_event.deltaY = -200;
   wheel_event.wheelTicksY = -2;
-  WebContents* web_contents = browser()->GetSelectedWebContents();
+  WebContents* web_contents = browser()->GetActiveWebContents();
   web_contents->GetRenderViewHost()->ForwardWheelEvent(wheel_event);
   ASSERT_NO_FATAL_FAILURE(WaitForResponse());
 
   int y_offset = 0;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       std::wstring(),
       L"window.domAutomationController.send(plugin.pageYOffset())",
       &y_offset));
@@ -260,7 +260,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) {
   ASSERT_NO_FATAL_FAILURE(Load());
   // Verifies that find in page works.
   ASSERT_EQ(3, ui_test_utils::FindInPage(
-      browser()->GetSelectedTabContentsWrapper(), UTF8ToUTF16("adipiscing"),
+      browser()->GetActiveTabContents(), UTF8ToUTF16("adipiscing"),
       true, false, NULL));
 
   // Verify that copying selected text works.
@@ -272,7 +272,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) {
   objects[ui::Clipboard::CBF_TEXT] = params;
   clipboard.WriteObjects(ui::Clipboard::BUFFER_STANDARD, objects);
 
-  browser()->GetSelectedWebContents()->GetRenderViewHost()->Copy();
+  browser()->GetActiveWebContents()->GetRenderViewHost()->Copy();
   ASSERT_NO_FATAL_FAILURE(WaitForResponse());
 
   std::string text;
@@ -288,7 +288,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) {
   ASSERT_TRUE(pdf_test_server()->Start());
 
   NavigationController* controller =
-      &(browser()->GetSelectedWebContents()->GetController());
+      &(browser()->GetActiveWebContents()->GetController());
   content::NotificationRegistrar registrar;
   registrar.Add(this,
                 content::NOTIFICATION_LOAD_STOP,
@@ -323,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) {
       // and before creating a byte-range request loader.
       bool complete = false;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-          browser()->GetSelectedWebContents()->GetRenderViewHost(),
+          browser()->GetActiveWebContents()->GetRenderViewHost(),
           std::wstring(),
           L"window.domAutomationController.send(plugin.documentLoadComplete())",
           &complete));
@@ -334,7 +334,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) {
       // nested message loop for the JS call.
       if (last_count != load_stop_notification_count())
         continue;
-      ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+      ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
     }
   }
 }
@@ -349,14 +349,14 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, DISABLED_OnLoadAndReload) {
   ui_test_utils::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetSelectedWebContents()->GetController()));
+          &browser()->GetActiveWebContents()->GetController()));
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       std::wstring(),
       L"reloadPDF();"));
   observer.Wait();
 
-  ASSERT_EQ("success", browser()->GetSelectedWebContents()->GetURL().query());
+  ASSERT_EQ("success", browser()->GetActiveWebContents()->GetURL().query());
 }
 
 }  // namespace
diff --git a/chrome/browser/ui/sync/browser_synced_window_delegate.cc b/chrome/browser/ui/sync/browser_synced_window_delegate.cc
index 73abfe1..fcc34d9 100644
--- a/chrome/browser/ui/sync/browser_synced_window_delegate.cc
+++ b/chrome/browser/ui/sync/browser_synced_window_delegate.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 
 // static SyncedWindowDelegate implementations
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc
index 5618f3d..6f8c9e14 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.cc
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 
 #include "chrome/browser/renderer_host/web_cache_manager.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
index b6dc733..5c0553f 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -208,18 +208,6 @@ TabContents* TabContents::Clone() {
   return new_tab_contents;
 }
 
-// static deprecated
-TabContents* TabContents::GetCurrentWrapperForContents(
-    WebContents* contents) {
-  return FromWebContents(contents);
-}
-
-// static deprecated
-const TabContents* TabContents::GetCurrentWrapperForContents(
-    const WebContents* contents) {
-  return FromWebContents(contents);
-}
-
 // static
 TabContents* TabContents::FromWebContents(WebContents* contents) {
   TabContents** tab_contents =
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index 0406ae9e..458e40a 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -104,10 +104,6 @@ class TabContents : public content::WebContentsObserver {
   // like callbacks from content/ where only a WebContents is available. In the
   // general case, please do NOT use this; plumb TabContents through the chrome/
   // code instead of WebContents.
-  static TabContents* GetCurrentWrapperForContents(
-      content::WebContents* contents);  // DEPRECATED
-  static const TabContents* GetCurrentWrapperForContents(
-      const content::WebContents* contents);  // DEPRECATED
   static TabContents* FromWebContents(content::WebContents* contents);
   static const TabContents* FromWebContents(
       const content::WebContents* contents);
diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator.cc
index caa90fc..8d9de65 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_iterator.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_iterator.cc
@@ -41,7 +41,7 @@ void TabContentsIterator::Advance() {
     }
 
     TabContents* next_tab =
-        (*browser_iterator_)->GetTabContentsWrapperAt(web_view_index_);
+        (*browser_iterator_)->GetTabContentsAt(web_view_index_);
     if (next_tab) {
       cur_ = next_tab;
       return;
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
deleted file mode 100644
index bdbc376..0000000
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
-#define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
-#pragma once
-
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
-
-typedef TabContents TabContentsWrapper;
-
-#endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index e840de3..3401bd4 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1958,7 +1958,7 @@ bool BrowserView::MaybeShowInfoBar(TabContents* contents) {
 void BrowserView::UpdateDevToolsForContents(TabContents* tab_contents) {
   WebContents* devtools_contents = NULL;
   if (tab_contents) {
-    TabContentsWrapper* devtools_tab_contents =
+    TabContents* devtools_tab_contents =
         DevToolsWindow::GetDevToolsContents(tab_contents->web_contents());
     if (devtools_tab_contents)
       devtools_contents = devtools_tab_contents->web_contents();
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
index f7b4a23..10e43b9 100644
--- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
@@ -7,7 +7,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/test_web_dialog_delegate.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -48,8 +48,9 @@ class ConstrainedWebDialogBrowserTest : public InProcessBrowserTest {
   ConstrainedWebDialogBrowserTest() {}
 
  protected:
-  size_t GetConstrainedWindowCount(TabContentsWrapper* wrapper) const {
-    return wrapper->constrained_window_tab_helper()->constrained_window_count();
+  size_t GetConstrainedWindowCount(TabContents* tab_contents) const {
+    return tab_contents->
+        constrained_window_tab_helper()->constrained_window_count();
   }
 };
 
@@ -58,17 +59,17 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest, BasicTest) {
   // The delegate deletes itself.
   WebDialogDelegate* delegate = new test::TestWebDialogDelegate(
       GURL(chrome::kChromeUIConstrainedHTMLTestURL));
-  TabContentsWrapper* wrapper = browser()->GetSelectedTabContentsWrapper();
-  ASSERT_TRUE(wrapper);
+  TabContents* tab_contents = browser()->GetActiveTabContents();
+  ASSERT_TRUE(tab_contents);
 
   ConstrainedWebDialogDelegate* dialog_delegate =
       ui::CreateConstrainedWebDialog(browser()->profile(),
                                      delegate,
                                      NULL,
-                                     wrapper);
+                                     tab_contents);
   ASSERT_TRUE(dialog_delegate);
   EXPECT_TRUE(dialog_delegate->window());
-  EXPECT_EQ(1U, GetConstrainedWindowCount(wrapper));
+  EXPECT_EQ(1U, GetConstrainedWindowCount(tab_contents));
 }
 
 // Tests that ReleaseTabContentsOnDialogClose() works.
@@ -77,25 +78,25 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,
   // The delegate deletes itself.
   WebDialogDelegate* delegate = new test::TestWebDialogDelegate(
       GURL(chrome::kChromeUIConstrainedHTMLTestURL));
-  TabContentsWrapper* wrapper = browser()->GetSelectedTabContentsWrapper();
-  ASSERT_TRUE(wrapper);
+  TabContents* tab_contents = browser()->GetActiveTabContents();
+  ASSERT_TRUE(tab_contents);
 
   ConstrainedWebDialogDelegate* dialog_delegate =
       ui::CreateConstrainedWebDialog(browser()->profile(),
                                      delegate,
                                      NULL,
-                                     wrapper);
+                                     tab_contents);
   ASSERT_TRUE(dialog_delegate);
-  scoped_ptr<TabContentsWrapper> new_tab(dialog_delegate->tab());
+  scoped_ptr<TabContents> new_tab(dialog_delegate->tab());
   ASSERT_TRUE(new_tab.get());
-  ASSERT_EQ(1U, GetConstrainedWindowCount(wrapper));
+  ASSERT_EQ(1U, GetConstrainedWindowCount(tab_contents));
 
   ConstrainedWebDialogBrowserTestObserver observer(new_tab->web_contents());
   dialog_delegate->ReleaseTabContentsOnDialogClose();
   dialog_delegate->OnDialogCloseFromWebUI();
 
   ASSERT_FALSE(observer.tab_destroyed());
-  EXPECT_EQ(0U, GetConstrainedWindowCount(wrapper));
+  EXPECT_EQ(0U, GetConstrainedWindowCount(tab_contents));
   new_tab.reset();
   EXPECT_TRUE(observer.tab_destroyed());
 }
diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc
index 090f616..acd3d38 100644
--- a/chrome/browser/ui/zoom/zoom_controller.cc
+++ b/chrome/browser/ui/zoom/zoom_controller.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.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/pref_names.h"
 #include "content/public/browser/notification_types.h"
@@ -15,11 +15,11 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_zoom.h"
 
-ZoomController::ZoomController(TabContentsWrapper* tab_contents)
+ZoomController::ZoomController(TabContents* tab_contents)
     : content::WebContentsObserver(tab_contents->web_contents()),
       zoom_icon_state_(NONE),
       zoom_percent_(100),
-      tab_contents_wrapper_(tab_contents),
+      tab_contents_(tab_contents),
       observer_(NULL) {
   default_zoom_level_.Init(prefs::kDefaultZoomLevel,
                            tab_contents->profile()->GetPrefs(), this);
@@ -60,8 +60,7 @@ void ZoomController::Observe(int type,
 }
 
 void ZoomController::UpdateState() {
-  double current_zoom_level =
-      tab_contents_wrapper_->web_contents()->GetZoomLevel();
+  double current_zoom_level = tab_contents_->web_contents()->GetZoomLevel();
   double default_zoom_level = default_zoom_level_.GetValue();
 
   ZoomIconState state;
@@ -73,19 +72,19 @@ void ZoomController::UpdateState() {
     state = ZOOM_MINUS_ICON;
 
   bool dummy;
-  int zoom_percent = tab_contents_wrapper_->web_contents()->
+  int zoom_percent = tab_contents_->web_contents()->
       GetZoomPercent(&dummy, &dummy);
 
   if (state != zoom_icon_state_) {
     zoom_icon_state_ = state;
     if (observer_)
-      observer_->OnZoomIconChanged(tab_contents_wrapper_, state);
+      observer_->OnZoomIconChanged(tab_contents_, state);
   }
 
   if (zoom_percent != zoom_percent_) {
     zoom_percent_ = zoom_percent;
     if (observer_)
-      observer_->OnZoomChanged(tab_contents_wrapper_,
+      observer_->OnZoomChanged(tab_contents_,
                                zoom_percent,
                                state != NONE);
   }
diff --git a/chrome/browser/ui/zoom/zoom_controller.h b/chrome/browser/ui/zoom/zoom_controller.h
index 7f887c6..8f27683 100644
--- a/chrome/browser/ui/zoom/zoom_controller.h
+++ b/chrome/browser/ui/zoom/zoom_controller.h
@@ -14,7 +14,6 @@
 #include "content/public/browser/web_contents_observer.h"
 
 class TabContents;
-typedef TabContents TabContentsWrapper;
 class ZoomObserver;
 
 // Per-tab class to manage the Omnibox zoom icon.
@@ -27,7 +26,7 @@ class ZoomController : public content::NotificationObserver,
     ZOOM_MINUS_ICON,
   };
 
-  explicit ZoomController(TabContentsWrapper* tab_contents);
+  explicit ZoomController(TabContents* tab_contents);
   virtual ~ZoomController();
 
   ZoomIconState zoom_icon_state() const { return zoom_icon_state_; }
@@ -61,8 +60,8 @@ class ZoomController : public content::NotificationObserver,
   // Used to access the default zoom level preference.
   DoublePrefMember default_zoom_level_;
 
-  // TabContentsWrapper that owns this instance.
-  TabContentsWrapper* tab_contents_wrapper_;
+  // TabContents that owns this instance.
+  TabContents* tab_contents_;
 
   // Observer receiving notifications on state changes.
   ZoomObserver* observer_;
diff --git a/chrome/browser/ui/zoom/zoom_observer.h b/chrome/browser/ui/zoom/zoom_observer.h
index 4baeede..74c8cc4 100644
--- a/chrome/browser/ui/zoom/zoom_observer.h
+++ b/chrome/browser/ui/zoom/zoom_observer.h
@@ -9,17 +9,16 @@
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 
 class TabContents;
-typedef TabContents TabContentsWrapper;
 
 // Interface for objects that wish to be notified of changes in ZoomController.
 class ZoomObserver {
  public:
   // Notification that the Omnibox zoom icon should change.
-  virtual void OnZoomIconChanged(TabContentsWrapper* source,
+  virtual void OnZoomIconChanged(TabContents* source,
                                  ZoomController::ZoomIconState state) = 0;
 
   // Notification that the zoom percentage has changed.
-  virtual void OnZoomChanged(TabContentsWrapper* source,
+  virtual void OnZoomChanged(TabContents* source,
                              int zoom_percent,
                              bool can_show_bubble) = 0;
 
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 41e2bed..fcd2c7e 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -7,7 +7,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser_navigator.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
@@ -137,8 +137,7 @@ void BrowserWithTestWindowTest::NavigateAndCommit(
 }
 
 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) {
-  NavigateAndCommit(&browser()->GetSelectedTabContentsWrapper()->
-      web_contents()->GetController(), url);
+  NavigateAndCommit(&browser()->GetActiveWebContents()->GetController(), url);
 }
 
 void BrowserWithTestWindowTest::DestroyBrowserAndProfile() {
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index b490213..a65d00c 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -348,7 +348,7 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
 
   if (!BrowserList::empty()) {
     browser_ = *BrowserList::begin();
-    ui_test_utils::WaitForLoadStop(browser_->GetSelectedWebContents());
+    ui_test_utils::WaitForLoadStop(browser_->GetActiveWebContents());
   }
 
   // Pump any pending events that were created as a result of creating a
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index a1a841a..42f167c 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -66,7 +66,7 @@ class TestBrowserWindow : public BrowserWindow {
   virtual LocationBar* GetLocationBar() const OVERRIDE;
   virtual void SetFocusToLocationBar(bool select_all) OVERRIDE {}
   virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE {}
-  virtual void UpdateToolbar(TabContentsWrapper* contents,
+  virtual void UpdateToolbar(TabContents* contents,
                              bool should_restore_state) OVERRIDE {}
   virtual void FocusToolbar() OVERRIDE {}
   virtual void FocusAppMenu() OVERRIDE {}
@@ -79,7 +79,7 @@ class TestBrowserWindow : public BrowserWindow {
   virtual void HandleKeyboardEvent(
       const content::NativeWebKeyboardEvent& event) OVERRIDE {}
   virtual void ShowCreateWebAppShortcutsDialog(
-      TabContentsWrapper* tab_contents) OVERRIDE {}
+      TabContents* tab_contents) OVERRIDE {}
   virtual void ShowCreateChromeAppShortcutsDialog(
       Profile* profile,
       const extensions::Extension* app) OVERRIDE {}
@@ -115,7 +115,7 @@ class TestBrowserWindow : public BrowserWindow {
                             const content::SSLStatus& ssl,
                             bool show_history) OVERRIDE {}
   virtual void ShowWebsiteSettings(Profile* profile,
-                                   TabContentsWrapper* wrapper,
+                                   TabContents* tab_contents,
                                    const GURL& url,
                                    const content::SSLStatus& ssl,
                                    bool show_history) OVERRIDE {}
@@ -131,7 +131,7 @@ class TestBrowserWindow : public BrowserWindow {
   virtual bool InPresentationMode() OVERRIDE;
 #endif
 
-  virtual void ShowInstant(TabContentsWrapper* preview_contents) OVERRIDE {}
+  virtual void ShowInstant(TabContents* preview_contents) OVERRIDE {}
   virtual void HideInstant() OVERRIDE {}
   virtual gfx::Rect GetInstantBounds() OVERRIDE;
   virtual WindowOpenDisposition GetDispositionForPopupBounds(
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 779c1a9..09702cb 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -41,7 +41,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.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_paths.h"
 #include "chrome/common/extensions/extension_action.h"
@@ -137,7 +137,7 @@ class DOMOperationObserver : public content::NotificationObserver,
 
 class FindInPageNotificationObserver : public content::NotificationObserver {
  public:
-  explicit FindInPageNotificationObserver(TabContentsWrapper* parent_tab)
+  explicit FindInPageNotificationObserver(TabContents* parent_tab)
       : parent_tab_(parent_tab),
         active_match_ordinal_(-1),
         number_of_matches_(0) {
@@ -175,7 +175,7 @@ class FindInPageNotificationObserver : public content::NotificationObserver {
 
  private:
   content::NotificationRegistrar registrar_;
-  TabContentsWrapper* parent_tab_;
+  TabContents* parent_tab_;
   // We will at some point (before final update) be notified of the ordinal and
   // we need to preserve it so we can send it later.
   int active_match_ordinal_;
@@ -314,7 +314,7 @@ void RunAllPendingInMessageLoop(content::BrowserThread::ID thread_id) {
 }
 
 bool GetCurrentTabTitle(const Browser* browser, string16* title) {
-  WebContents* web_contents = browser->GetSelectedWebContents();
+  WebContents* web_contents = browser->GetActiveWebContents();
   if (!web_contents)
     return false;
   NavigationEntry* last_entry = web_contents->GetController().GetActiveEntry();
@@ -382,7 +382,7 @@ void OpenURLOffTheRecord(Profile* profile, const GURL& url) {
   Browser::OpenURLOffTheRecord(profile, url);
   Browser* browser = browser::FindTabbedBrowser(
       profile->GetOffTheRecordProfile(), false);
-  WaitForNavigations(&browser->GetSelectedWebContents()->GetController(), 1);
+  WaitForNavigations(&browser->GetActiveWebContents()->GetController(), 1);
 }
 
 void NavigateToURL(browser::NavigateParams* params) {
@@ -411,11 +411,11 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete(
     int number_of_navigations,
     WindowOpenDisposition disposition,
     int browser_test_flags) {
-  if (disposition == CURRENT_TAB && browser->GetSelectedWebContents())
-    WaitForLoadStop(browser->GetSelectedWebContents());
+  if (disposition == CURRENT_TAB && browser->GetActiveWebContents())
+    WaitForLoadStop(browser->GetActiveWebContents());
   NavigationController* controller =
-      browser->GetSelectedWebContents() ?
-      &browser->GetSelectedWebContents()->GetController() : NULL;
+      browser->GetActiveWebContents() ?
+      &browser->GetActiveWebContents()->GetController() : NULL;
   content::TestNavigationObserver same_tab_observer(
       content::Source<NavigationController>(controller),
       NULL,
@@ -460,7 +460,7 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete(
       (disposition == NEW_FOREGROUND_TAB) ||
       (disposition == SINGLETON_TAB)) {
     // The currently selected tab is the right one.
-    web_contents = browser->GetSelectedWebContents();
+    web_contents = browser->GetActiveWebContents();
   }
   if (disposition == CURRENT_TAB) {
     same_tab_observer.WaitForObservation(
@@ -504,7 +504,7 @@ void NavigateToURLBlockUntilNavigationsComplete(Browser* browser,
 DOMElementProxyRef GetActiveDOMDocument(Browser* browser) {
   JavaScriptExecutionController* executor =
       new InProcessJavaScriptExecutionController(
-          browser->GetSelectedWebContents()->GetRenderViewHost());
+          browser->GetActiveWebContents()->GetRenderViewHost());
   int element_handle;
   executor->ExecuteJavaScriptAndGetReturn("document;", &element_handle);
   return executor->GetObjectProxy<DOMElementProxy>(element_handle);
@@ -600,7 +600,7 @@ void CrashTab(WebContents* tab) {
   observer.Wait();
 }
 
-int FindInPage(TabContentsWrapper* tab_contents, const string16& search_string,
+int FindInPage(TabContents* tab_contents, const string16& search_string,
                bool forward, bool match_case, int* ordinal) {
   tab_contents->
       find_tab_helper()->StartFinding(search_string, forward, match_case);
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index 086d084..d16274a 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -52,7 +52,6 @@ class Profile;
 class ScopedTempDir;
 class SkBitmap;
 class TabContents;
-typedef TabContents TabContentsWrapper;
 class TemplateURLService;
 
 namespace browser {
@@ -215,7 +214,7 @@ void CrashTab(content::WebContents* tab);
 // Performs a find in the page of the specified tab. Returns the number of
 // matches found.  |ordinal| is an optional parameter which is set to the index
 // of the current match.
-int FindInPage(TabContentsWrapper* tab,
+int FindInPage(TabContents* tab,
                const string16& search_string,
                bool forward,
                bool case_sensitive,
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index 39ed3b2..2fe6b41 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -166,7 +166,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
     js_call << ");";
 
     ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
-        browser()->GetSelectedWebContents()->GetRenderViewHost(),
+        browser()->GetActiveWebContents()->GetRenderViewHost(),
         L"", js_call.str()));
 
     std::string message;
@@ -373,7 +373,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
   // have if the tab contents have the desired size.
   gfx::Rect GetNewTabContainerBounds(const gfx::Size& desired_size) {
     gfx::Rect container_rect;
-    browser()->GetSelectedWebContents()->GetContainerBounds(&container_rect);
+    browser()->GetActiveWebContents()->GetContainerBounds(&container_rect);
     // Size cannot be negative, so use a point.
     gfx::Point correction(
         desired_size.width() - container_rect.size().width(),
@@ -393,7 +393,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest {
 
     gfx::Rect root_bounds = browser()->window()->GetBounds();
     gfx::Rect tab_contents_bounds;
-    browser()->GetSelectedWebContents()->GetContainerBounds(
+    browser()->GetActiveWebContents()->GetContainerBounds(
         &tab_contents_bounds);
 
     gfx::Rect snapshot_bounds(tab_contents_bounds.x() - root_bounds.x(),
diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc
index de72c18..3fe99fe 100644
--- a/chrome/test/perf/rendering/latency_tests.cc
+++ b/chrome/test/perf/rendering/latency_tests.cc
@@ -14,7 +14,7 @@
 #include "base/timer.h"
 #include "base/version.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/tracing.h"
@@ -600,8 +600,8 @@ void LatencyTest::GetMeanFrameTimeMicros(int* frame_time) const {
 }
 
 void LatencyTest::SendInput() {
-  content::RenderViewHost* rvh = browser()->GetSelectedTabContentsWrapper()->
-      web_contents()->GetRenderViewHost();
+  content::RenderViewHost* rvh =
+      browser()->GetActiveWebContents()->GetRenderViewHost();
   WebKit::WebMouseEvent mouse_event;
   mouse_event.movementX = 1;
   mouse_x_ += mouse_event.movementX;
diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc
index 84f96e3..b6e11b4 100644
--- a/chrome/test/perf/rendering/throughput_tests.cc
+++ b/chrome/test/perf/rendering/throughput_tests.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -207,7 +207,7 @@ class ThroughputTest : public BrowserPerfTest {
 
     gfx::Rect root_bounds = browser()->window()->GetBounds();
     gfx::Rect tab_contents_bounds;
-    browser()->GetSelectedWebContents()->GetContainerBounds(
+    browser()->GetActiveWebContents()->GetContainerBounds(
         &tab_contents_bounds);
 
     gfx::Rect snapshot_bounds(tab_contents_bounds.x() - root_bounds.x(),
@@ -313,7 +313,7 @@ class ThroughputTest : public BrowserPerfTest {
     LOG(INFO) << gurl_.possibly_invalid_spec();
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), gurl_, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
-    ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
+    ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
 
     // Let the test spin up.
     LOG(INFO) << "Spinning up test...";
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 9e07c9e..e4eda70 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -232,7 +232,7 @@ void PPAPITestBase::RunTestURL(const GURL& test_url) {
   // any other value indicates completion (in this case it will start with
   // "PASS" or "FAIL"). This keeps us from timing out on waits for long tests.
   TestFinishObserver observer(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(), kTimeoutMs);
+      browser()->GetActiveWebContents()->GetRenderViewHost(), kTimeoutMs);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
@@ -1056,7 +1056,7 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) {
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) {
   // The plugin will be loaded in the foreground tab and will send us a message.
   TestFinishObserver observer(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       TestTimeouts::action_max_timeout_ms());
 
   GURL url = GetTestFileUrl("View_PageHideShow");