diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 19:35:33 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 19:35:33 +0000 |
| commit | 871dc6890d6d697ff286b3c14e6cff07efa19baf (patch) | |
| tree | 139899d57e4bb4245a3cd93d0d7a3004ab3225ba /chrome/browser/repost_form_warning_browsertest.cc | |
| parent | 8d387e0d6603e070ca5553f540db990f18bb3d49 (diff) | |
| download | chromium_src-871dc6890d6d697ff286b3c14e6cff07efa19baf.zip chromium_src-871dc6890d6d697ff286b3c14e6cff07efa19baf.tar.gz chromium_src-871dc6890d6d697ff286b3c14e6cff07efa19baf.tar.bz2 | |
TabContentsWrapper -> TabContents, part 33.
Loose files in browser/.
BUG=131026
TEST=no change
Review URL: https://chromiumcodereview.appspot.com/10538073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/repost_form_warning_browsertest.cc')
| -rw-r--r-- | chrome/browser/repost_form_warning_browsertest.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc index 97dc346..c5863c8 100644 --- a/chrome/browser/repost_form_warning_browsertest.cc +++ b/chrome/browser/repost_form_warning_browsertest.cc @@ -6,7 +6,7 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -32,15 +32,14 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestDoubleReload) { GURL("javascript:document.getElementById('form').submit()")); // Try to reload it twice, checking for repost. - content::WebContents* web_contents = browser()->GetSelectedWebContents(); + content::WebContents* web_contents = browser()->GetActiveWebContents(); web_contents->GetController().Reload(true); web_contents->GetController().Reload(true); // There should only be one dialog open. - TabContentsWrapper* wrapper = - TabContentsWrapper::GetCurrentWrapperForContents(web_contents); + TabContents* tab_contents = TabContents::FromWebContents(web_contents); size_t num_constrained_windows = - wrapper->constrained_window_tab_helper()->constrained_window_count(); + tab_contents->constrained_window_tab_helper()->constrained_window_count(); EXPECT_EQ(1u, num_constrained_windows); // Navigate away from the page (this is when the test usually crashes). @@ -48,7 +47,7 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestDoubleReload) { // The dialog should've been closed. num_constrained_windows = - wrapper->constrained_window_tab_helper()->constrained_window_count(); + tab_contents->constrained_window_tab_helper()->constrained_window_count(); EXPECT_EQ(0u, num_constrained_windows); } @@ -65,7 +64,7 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestLoginAfterRepost) { GURL("javascript:document.getElementById('form').submit()")); // Try to reload it, checking for repost. - content::WebContents* web_contents = browser()->GetSelectedWebContents(); + content::WebContents* web_contents = browser()->GetActiveWebContents(); web_contents->GetController().Reload(true); // Navigate to a page that requires authentication, bringing up another |