diff options
author | simonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 23:03:27 +0000 |
---|---|---|
committer | simonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 23:03:27 +0000 |
commit | d19a6fe83c7204b85d0f17e16514e3c70f3847c3 (patch) | |
tree | 58f21081ee8e47a76d0d0fd5147033e39905e0e4 /chrome/browser/ssl | |
parent | 3c59cb9f9ec1231ad8ed7a0453547867229ac9b9 (diff) | |
download | chromium_src-d19a6fe83c7204b85d0f17e16514e3c70f3847c3.zip chromium_src-d19a6fe83c7204b85d0f17e16514e3c70f3847c3.tar.gz chromium_src-d19a6fe83c7204b85d0f17e16514e3c70f3847c3.tar.bz2 |
Disable 3 ssl tests.
BUG=85475
TEST=browser_tests
TBR=tsepez
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88434 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, 8 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index b045fee..b89c3db 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -455,7 +455,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContent) { // Visits a page that runs insecure content and tries to suppress the insecure // content warnings by randomizing location.hash. // Based on http://crbug.com/8706 -IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecuredContentRandomizeHash) { +// Disabled, http://crbug.com/85475. +IN_PROC_BROWSER_TEST_F(SSLUITest, + DISABLED_TestRunsInsecuredContentRandomizeHash) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(https_server_.Start()); @@ -578,7 +580,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) { // Visits two pages from the same origin: one that runs insecure content and one // that doesn't. The test checks that we propagate the insecure content state // from one to the other. -IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { +// Disabled, http://crbug.com/85475. +IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRunsInsecureContentTwoTabs) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(https_server_.Start()); @@ -644,7 +647,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysCachedInsecureContent) { #define MAYBE_TestRunsCachedInsecureContent \ DISABLED_TestRunsCachedInsecureContent #else -#define MAYBE_TestRunsCachedInsecureContent TestRunsCachedInsecureContent +// Disabled, http://crbug.com/85475. +#define MAYBE_TestRunsCachedInsecureContent \ + DISABLED_TestRunsCachedInsecureContent #endif // defined(OS_CHROMEOS) // Visits a page with script over http. Visits another page over https |