summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 19:58:57 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 19:58:57 +0000
commitc21453306e24ac62fcecbf067fe7f3dd8168cafc (patch)
treeef87a8a3fac85bc7104613bde67cba55b0c71c03 /chrome/browser/ssl
parent53862ed4f444cc73afd5913cb04932c072d9d6dc (diff)
downloadchromium_src-c21453306e24ac62fcecbf067fe7f3dd8168cafc.zip
chromium_src-c21453306e24ac62fcecbf067fe7f3dd8168cafc.tar.gz
chromium_src-c21453306e24ac62fcecbf067fe7f3dd8168cafc.tar.bz2
Disable test that times out.
BUG=43437 TEST=None TBR=jcivelli git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 77d0856..735941f 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -850,7 +850,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestBadFrameNavigation) {
// From an HTTP top frame, navigate to good and bad HTTPS (security state should
// stay unauthenticated).
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)
// Disabled, flakily exceeds test timeout, http://crbug.com/43437.
#define MAYBE_TestUnauthenticatedFrameNavigation \
DISABLED_TestUnauthenticatedFrameNavigation