TabContentsWrapper -> TabContents, part 57.

content/browser/session_history_browsertest.cc

Index: content/browser/session_history_browsertest.cc
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc
index 74d94e37bb2293afc94001e3fa1a37bc31bf8a7a..5544bedd83e0565c5a7e15ccfdd56fe1a7ac17fe 100644
--- a/content/browser/session_history_browsertest.cc
+++ b/content/browser/session_history_browsertest.cc
@@ -54,11 +54,11 @@ class SessionHistoryTest : public InProcessBrowserTest {
   }
 
   std::string GetTabTitle() {
-    return UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle());
+    return UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle());
   }
 
   GURL GetTabURL() {
-    return browser()->GetSelectedWebContents()->GetURL();
+    return browser()->GetActiveWebContents()->GetURL();
   }
 
   GURL GetURL(const std::string file) {
@@ -69,7 +69,7 @@ class SessionHistoryTest : public InProcessBrowserTest {
                              const std::string& expected_title) {
     string16 expected_title16(ASCIIToUTF16(expected_title));
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetSelectedWebContents(), expected_title16);
+        browser()->GetActiveWebContents(), expected_title16);
     ui_test_utils::NavigateToURL(browser(), GetURL(filename));
     ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
@@ -434,14 +434,14 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, LocationChangeInSubframe) {
 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   int length;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(1, length);
 
   ui_test_utils::NavigateToURL(browser(), GetURL("title1.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 
@@ -449,7 +449,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   ui_test_utils::NavigateToURL(browser(), GetURL("record_length.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(3, length);
 
@@ -460,7 +460,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   ui_test_utils::NavigateToURL(browser(), GetURL("title2.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetSelectedWebContents()->GetRenderViewHost(),
+      browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }