diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 21:06:51 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 21:06:51 +0000 |
| commit | 1e23ec07b41b1ffa0a54f1dff217bec32b59f83c (patch) | |
| tree | 7641ca8cf26082689869d9ef14a302c42f668112 /content/browser/plugin_browsertest.cc | |
| parent | fa234a15ddccfac8c284e1191f8fffd9481f95cf (diff) | |
| download | chromium_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/plugin_browsertest.cc')
| -rw-r--r-- | content/browser/plugin_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index 6e704e1..d5d89ba 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 |