diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 22:28:30 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 22:28:30 +0000 |
| commit | a6e602f4041198222584e5f449f145d0b886dba5 (patch) | |
| tree | af3ac167919a62663e53f52453f98a973edac9f5 /chrome/browser/ssl | |
| parent | 25da2f324b3ff67bde74b4d339429c582e54147a (diff) | |
| download | chromium_src-a6e602f4041198222584e5f449f145d0b886dba5.zip chromium_src-a6e602f4041198222584e5f449f145d0b886dba5.tar.gz chromium_src-a6e602f4041198222584e5f449f145d0b886dba5.tar.bz2 | |
Refactoring ui_test_utils code
BUG=none
TEST=all tests that used to pass should continue to pass
Review URL: http://codereview.chromium.org/3402030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index fb20b0a..a897e1b 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -328,20 +328,17 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) { IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { ASSERT_TRUE(https_server_expired_.Start()); - ui_test_utils::WindowedNotificationObserver<NavigationController> - load_stop_signal(NotificationType::LOAD_STOP, NULL); - Browser* used_browser = NULL; - TabContents* tab_contents = browser()->AddTabWithURL( - https_server_expired_.GetURL("files/ssl/google.htm"), GURL(), - PageTransition::TYPED, -1, TabStripModel::ADD_SELECTED, - NULL, std::string(), &used_browser); - load_stop_signal.WaitFor(&(tab_contents->controller())); + GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); + TabContents* tab2 = browser()->AddTabWithURL( + url, GURL(), PageTransition::TYPED, -1, TabStripModel::ADD_SELECTED, NULL, + std::string(), NULL); + ui_test_utils::WaitForLoadStop(&(tab2->controller())); // Verify our assumption that there was no prior navigation. EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_BACK)); // We should have an interstitial page showing. - ASSERT_TRUE(tab_contents->interstitial_page()); + ASSERT_TRUE(tab2->interstitial_page()); } // |