TabContentsWrapper -> TabContents, part 26.

chrome/browser/sessions/session_restore_browsertest.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 457 matching lines @@
   // here to avoid a crash.
   window.tabs.clear();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, Basic) {
   ui_test_utils::NavigateToURL(browser(), url1_);
   ui_test_utils::NavigateToURL(browser(), url2_);
 
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, BrowserList::size());
-  ASSERT_EQ(url2_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL());
   GoBack(new_browser);
-  ASSERT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoresForwardAndBackwardNavs) {
   ui_test_utils::NavigateToURL(browser(), url1_);
   ui_test_utils::NavigateToURL(browser(), url2_);
   ui_test_utils::NavigateToURL(browser(), url3_);
 
   GoBack(browser());
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, BrowserList::size());
-  ASSERT_EQ(url2_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL());
   GoForward(new_browser);
-  ASSERT_EQ(url3_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url3_, new_browser->GetActiveWebContents()->GetURL());
   GoBack(new_browser);
-  ASSERT_EQ(url2_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL());
 
   // Test renderer-initiated back/forward as well.
   GURL go_back_url("javascript:history.back();");
   ui_test_utils::NavigateToURL(new_browser, go_back_url);
-  ASSERT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
 }
 
 // Tests that the SiteInstances used for entries in a restored tab's history
 // are given appropriate max page IDs, so that going back to a restored
 // cross-site page and then forward again works.  (Bug 1204135)
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
                        RestoresCrossSiteForwardAndBackwardNavs) {
   ASSERT_TRUE(test_server()->Start());
 
   GURL cross_site_url(test_server()->GetURL("files/title2.html"));
 
   // Visit URLs on different sites.
   ui_test_utils::NavigateToURL(browser(), url1_);
   ui_test_utils::NavigateToURL(browser(), cross_site_url);
   ui_test_utils::NavigateToURL(browser(), url2_);
 
   GoBack(browser());
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, BrowserList::size());
   ASSERT_EQ(1, new_browser->tab_count());
 
   // Check that back and forward work as expected.
-  ASSERT_EQ(cross_site_url, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(cross_site_url, new_browser->GetActiveWebContents()->GetURL());
 
   GoBack(new_browser);
-  ASSERT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
 
   GoForward(new_browser);
-  ASSERT_EQ(cross_site_url, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(cross_site_url, new_browser->GetActiveWebContents()->GetURL());
 
   // Test renderer-initiated back/forward as well.
   GURL go_forward_url("javascript:history.forward();");
   ui_test_utils::NavigateToURL(new_browser, go_forward_url);
-  ASSERT_EQ(url2_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoTabsSecondSelected) {
   ui_test_utils::NavigateToURL(browser(), url1_);
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url2_, NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   Browser* new_browser = QuitBrowserAndRestore(browser(), 2);
 
   ASSERT_EQ(1u, BrowserList::size());
   ASSERT_EQ(2, new_browser->tab_count());
   ASSERT_EQ(1, new_browser->active_index());
-  ASSERT_EQ(url2_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL());
 
   ASSERT_EQ(url1_, new_browser->GetWebContentsAt(0)->GetURL());
 }
 
 // Creates two tabs, closes one, quits and makes sure only one tab is restored.
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ClosedTabStaysClosed) {
   ui_test_utils::NavigateToURL(browser(), url1_);
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url2_, NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   browser()->CloseTab();
 
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
 
   AssertOneWindowWithOneTab(new_browser);
-  ASSERT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
 }
 
 // Test to verify that the print preview tab is not restored.
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, DontRestorePrintPreviewTabTest) {
   ui_test_utils::NavigateToURL(browser(), url1_);
 
   // Append the print preview tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUIPrintURL), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   // Restart and make sure we have only one window with one tab and the url
   // is url1_.
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
 
   AssertOneWindowWithOneTab(new_browser);
-  ASSERT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
 }
 
 // Creates a tabbed browser and popup and makes sure we restore both.
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NormalAndPopup) {
   if (!browser_defaults::kRestorePopups)
     return;  // Test only applicable if restoring popups.
 
   ui_test_utils::NavigateToURL(browser(), url1_);
 
   // Make sure we have one window.
@@ skipping 57 matching lines @@
   ASSERT_EQ(2u, BrowserList::size());
 
   // Close the first window. The only window left is the App window.
   CloseBrowserSynchronously(browser());
 
   // Restore the session, which should bring back the first window with url1_.
   Browser* new_browser = QuitBrowserAndRestore(app_window, 1);
 
   AssertOneWindowWithOneTab(new_browser);
 
-  ASSERT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
 }
 
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
 
 // Creates two windows, closes one, restores, make sure only one window open.
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) {
   ui_test_utils::NavigateToURL(browser(), url1_);
 
   // Open a second window.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kAboutBlankURL), NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
 
   ASSERT_EQ(2u, BrowserList::size());
 
   // Close it.
   Browser* new_window = *(++BrowserList::begin());
   CloseBrowserSynchronously(new_window);
 
   // Restart and make sure we have only one window with one tab and the url
   // is url1_.
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
 
   AssertOneWindowWithOneTab(new_browser);
 
-  ASSERT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
 }
 
 // Make sure after a restore the number of processes matches that of the number
 // of processes running before the restore. This creates a new tab so that
 // we should have two new tabs running.  (This test will pass in both
 // process-per-site and process-per-site-instance, because we treat the new tab
 // as a special case in process-per-site-instance so that it only ever uses one
 // process.)
 //
 // Flaky: http://code.google.com/p/chromium/issues/detail?id=52022
@@ skipping 53 matching lines @@
 
   // Restore the session again, globbering the existing tab.
   SessionRestore::RestoreSession(
       profile, new_browser,
       SessionRestore::CLOBBER_CURRENT_TAB | SessionRestore::SYNCHRONOUS,
       std::vector<GURL>());
 
   // The pinned tab is the selected tab.
   ASSERT_EQ(2, new_browser->tab_count());
   EXPECT_EQ(0, new_browser->active_index());
-  EXPECT_EQ(url1_, new_browser->GetSelectedWebContents()->GetURL());
+  EXPECT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL());
   EXPECT_EQ(url2_, new_browser->GetWebContentsAt(1)->GetURL());
 }