Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1442)

Unified Diff: chrome/browser/history/history_browsertest.cc

Issue 10534062: TabContentsWrapper -> TabContents, part 16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/history/multipart_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_browsertest.cc
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index 9857d73813d94826b7f8253ab672b60c535594e5..257fbcd2623e7f3cef9c3cd5aaf39b1093faf64f 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -136,7 +136,7 @@ class HistoryBrowserTest : public InProcessBrowserTest {
void LoadAndWaitForURL(const GURL& url) {
string16 expected_title(ASCIIToUTF16("OK"));
ui_test_utils::TitleWatcher title_watcher(
- browser()->GetSelectedWebContents(), expected_title);
+ browser()->GetActiveWebContents(), expected_title);
title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
ui_test_utils::NavigateToURL(browser(), url);
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
@@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest,
// Therefore, Page 11 should be in the history in addition to Page 12.
LoadAndWaitForFile("history_length_test_page_11.html");
- ui_test_utils::SimulateMouseClick(browser()->GetSelectedWebContents());
+ ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
LoadAndWaitForFile("history_length_test_page_11.html");
}
@@ -300,9 +300,9 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, HistorySearchXSS) {
// so that we're not susceptible (less susceptible?) to a race condition.
// Should a race condition ever trigger, it won't result in flakiness.
int num = ui_test_utils::FindInPage(
- browser()->GetSelectedTabContentsWrapper(), ASCIIToUTF16("<img"), true,
+ browser()->GetActiveTabContents(), ASCIIToUTF16("<img"), true,
true, NULL);
EXPECT_GT(num, 0);
EXPECT_EQ(ASCIIToUTF16("History"),
- browser()->GetSelectedWebContents()->GetTitle());
+ browser()->GetActiveWebContents()->GetTitle());
}
« no previous file with comments | « no previous file | chrome/browser/history/multipart_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698