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

Unified Diff: content/browser/plugin_browsertest.cc

Issue 10539134: TabContentsWrapper -> TabContents, part 57. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last use 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
Index: content/browser/plugin_browsertest.cc
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
index 6e704e107658c1187aabde0a5d26a8c09ffa22e3..d5d89ba26ef8e9f7bfef47bcee29deec53e0b36b 100644
--- a/content/browser/plugin_browsertest.cc
+++ b/content/browser/plugin_browsertest.cc
@@ -84,7 +84,7 @@ class PluginTest : public InProcessBrowserTest {
void LoadAndWait(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"));
title_watcher.AlsoWaitForTitle(ASCIIToUTF16("plugin_not_found"));
ui_test_utils::NavigateToURL(browser(), url);
@@ -175,9 +175,9 @@ IN_PROC_BROWSER_TEST_F(PluginTest,
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::SimulateMouseClick(browser()->GetSelectedWebContents());
+ ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
}
#endif
@@ -202,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeAlert) {
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::WaitForAppModalDialogAndCloseIt();
@@ -399,12 +399,12 @@ IN_PROC_BROWSER_TEST_F(PluginTest, PluginConvertPointTest) {
string16 expected_title(ASCIIToUTF16("OK"));
ui_test_utils::TitleWatcher title_watcher(
- browser()->GetSelectedWebContents(), expected_title);
+ browser()->GetActiveWebContents(), expected_title);
title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
// TODO(stuartmorgan): When the automation system supports sending clicks,
// change the test to trigger on mouse-down rather than window focus.
static_cast<content::WebContentsDelegate*>(browser())->
- ActivateContents(browser()->GetSelectedWebContents());
+ ActivateContents(browser()->GetActiveWebContents());
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
}
#endif
« no previous file with comments | « content/browser/mouseleave_browsertest.cc ('k') | content/browser/renderer_host/render_process_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698