summaryrefslogtreecommitdiffstats
path: root/content/browser/session_history_browsertest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 21:06:51 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 21:06:51 +0000
commit1e23ec07b41b1ffa0a54f1dff217bec32b59f83c (patch)
tree7641ca8cf26082689869d9ef14a302c42f668112 /content/browser/session_history_browsertest.cc
parentfa234a15ddccfac8c284e1191f8fffd9481f95cf (diff)
downloadchromium_src-1e23ec07b41b1ffa0a54f1dff217bec32b59f83c.zip
chromium_src-1e23ec07b41b1ffa0a54f1dff217bec32b59f83c.tar.gz
chromium_src-1e23ec07b41b1ffa0a54f1dff217bec32b59f83c.tar.bz2
TabContentsWrapper -> TabContents, part 57.
That's really all. BUG=131026 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10539134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/session_history_browsertest.cc')
-rw-r--r--content/browser/session_history_browsertest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc
index 74d94e3..5544bed 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);
}