summaryrefslogtreecommitdiffstats
path: root/chrome/browser/crash_recovery_browsertest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-15 00:02:40 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-15 00:02:40 +0000
commitb7a20d363af744159a2bb85bfe3db027d2d4819e (patch)
tree14a363b284d4456d6c0a4888a6b944af3e10b490 /chrome/browser/crash_recovery_browsertest.cc
parent3f58d855ccb7c29abd2fd73cb60e11089abe8dd1 (diff)
downloadchromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.zip
chromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.tar.gz
chromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.tar.bz2
Convert parts of errorpage_uitest.cc to be not flaky.
TEST=Covered by browser_tests. http://crbug.com/19361, http://crbug.com/19395 Review URL: http://codereview.chromium.org/169002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/crash_recovery_browsertest.cc')
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index 1a61b15..63ddf11 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -70,7 +70,8 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_before_crash));
SimulateRendererCrash(browser());
- ASSERT_TRUE(ui_test_utils::ReloadCurrentTab(browser()));
+ browser()->Reload();
+ ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_after_crash));
EXPECT_NE(title_before_crash, title_after_crash);
@@ -90,7 +91,8 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_before_crash));
SimulateRendererCrash(browser());
- ASSERT_TRUE(ui_test_utils::ReloadCurrentTab(browser()));
+ browser()->Reload();
+ ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_after_crash));
EXPECT_EQ(title_before_crash, title_after_crash);