summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 17:44:44 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 17:44:44 +0000
commit1ea49d5727a9e6ba1375030c5e38b992ca4015e8 (patch)
tree0e6e49879c0ec583c6a3da445bfd0a1ba370e674 /chrome/browser/browser_browsertest.cc
parenta34f012a19f0915ba5ebc9ba8049763651839515 (diff)
downloadchromium_src-1ea49d5727a9e6ba1375030c5e38b992ca4015e8.zip
chromium_src-1ea49d5727a9e6ba1375030c5e38b992ca4015e8.tar.gz
chromium_src-1ea49d5727a9e6ba1375030c5e38b992ca4015e8.tar.bz2
Renames TabStripModel and Browser's selected_index to
active_index. I plan on renaming more, but wanted to start with this one. BUG=none TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/6823064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index b4c5cbb..71746e5 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -209,7 +209,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) {
ui_test_utils::NavigateToURL(browser(), url);
AddTabAtIndex(0, url, PageTransition::TYPED);
EXPECT_EQ(2, browser()->tab_count());
- EXPECT_EQ(0, browser()->selected_index());
+ EXPECT_EQ(0, browser()->active_index());
TabContents* second_tab = browser()->GetTabContentsAt(1);
ASSERT_TRUE(second_tab);
second_tab->render_view_host()->ExecuteJavascriptInWebFrame(
@@ -218,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) {
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
alert->CloseModalDialog();
EXPECT_EQ(2, browser()->tab_count());
- EXPECT_EQ(1, browser()->selected_index());
+ EXPECT_EQ(1, browser()->active_index());
}