summaryrefslogtreecommitdiffstats
path: root/chrome/browser/login_prompt_uitest.cc
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 19:37:04 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 19:37:04 +0000
commit814c2c4a1023d78c5f3f05eac298996a7d6c9444 (patch)
treec7763a6563bbb1aa4cc6a8810bcc9646a5b18deb /chrome/browser/login_prompt_uitest.cc
parent4026ce1e61982fe637913ea59c66f16c5d9165ee (diff)
downloadchromium_src-814c2c4a1023d78c5f3f05eac298996a7d6c9444.zip
chromium_src-814c2c4a1023d78c5f3f05eac298996a7d6c9444.tar.gz
chromium_src-814c2c4a1023d78c5f3f05eac298996a7d6c9444.tar.bz2
Revert 59417 - Failing fairly often due to tab->NavigateToURL(...) failing.
BUG=55380 TEST=greener tree Review URL: http://codereview.chromium.org/3439003 TBR=vandebo@chromium.org Review URL: http://codereview.chromium.org/3427003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/login_prompt_uitest.cc')
-rw-r--r--chrome/browser/login_prompt_uitest.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/login_prompt_uitest.cc b/chrome/browser/login_prompt_uitest.cc
index c65f953..11315ef 100644
--- a/chrome/browser/login_prompt_uitest.cc
+++ b/chrome/browser/login_prompt_uitest.cc
@@ -121,16 +121,8 @@ TEST_F(LoginPromptTest, TestTwoAuths) {
EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), title);
}
-// http://crbug.com/55380 - NavigateToURL is making this flaky.
-#if defiend(OS_WIN)
-#define MAYBE_TestCancelAuth FLAKY_TestCancelAuth
-#elif defined(OS_LINUX)
-#define MAYBE_TestCancelAuth FLAKY_TestCancelAuth
-#else
-#define MAYBE_TestCancelAuth TestCancelAuth
-#endif
// Test that cancelling authentication works.
-TEST_F(LoginPromptTest, MAYBE_TestCancelAuth) {
+TEST_F(LoginPromptTest, TestCancelAuth) {
ASSERT_TRUE(test_server_.Start());
scoped_refptr<TabProxy> tab(GetActiveTab());