diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 14:46:51 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 14:46:51 +0000 |
| commit | 3927f8220bb3782e48f41e6ea2da98ca8247b554 (patch) | |
| tree | e7d5e02787ef039954084c7df5c87ace29f36aae /chrome/browser/ssl | |
| parent | 06a26cee05ab7e5c49f7dc5b07ed6224fe4876db (diff) | |
| download | chromium_src-3927f8220bb3782e48f41e6ea2da98ca8247b554.zip chromium_src-3927f8220bb3782e48f41e6ea2da98ca8247b554.tar.gz chromium_src-3927f8220bb3782e48f41e6ea2da98ca8247b554.tar.bz2 | |
GTTF: Remove the flaky mark from SSLUITest.TestDisplaysInsecureContentLoadedFromJS
The last test failure occurred on September 14th.
TBR=jcivelli
BUG=52557
TEST=browser_tests
Review URL: http://codereview.chromium.org/3395013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index a98fae6..e19c1f1 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -415,16 +415,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) { // Visits a page with insecure content loaded by JS (after the initial page // load). -#if defined(OS_WIN) -// Flakily exceeds test timeout, http://crbug.com/52557. -#define MAYBE_TestDisplaysInsecureContentLoadedFromJS \ - FLAKY_TestDisplaysInsecureContentLoadedFromJS -#else -#define MAYBE_TestDisplaysInsecureContentLoadedFromJS \ - TestDisplaysInsecureContentLoadedFromJS -#endif -IN_PROC_BROWSER_TEST_F(SSLUITest, - MAYBE_TestDisplaysInsecureContentLoadedFromJS) { +IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(https_server_.Start()); |