2 files changed, 7 insertions, 9 deletions
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();
 }