Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 2680013004: Mark flaky on mac: SSLBlockingPageIDNTest.SSLBlockingPageDecodesIDN (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <utility> 5 #include <utility>
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 3709 matching lines...) Expand 10 before | Expand all | Expand 10 after
3720 net::SSLInfo ssl_info; 3720 net::SSLInfo ssl_info;
3721 ssl_info.cert = 3721 ssl_info.cert =
3722 net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem"); 3722 net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
3723 return SSLBlockingPage::Create( 3723 return SSLBlockingPage::Create(
3724 contents, net::ERR_CERT_CONTAINS_ERRORS, ssl_info, request_url, 0, 3724 contents, net::ERR_CERT_CONTAINS_ERRORS, ssl_info, request_url, 0,
3725 base::Time::NowFromSystemTime(), nullptr, 3725 base::Time::NowFromSystemTime(), nullptr,
3726 base::Callback<void(content::CertificateRequestResultType)>()); 3726 base::Callback<void(content::CertificateRequestResultType)>());
3727 } 3727 }
3728 }; 3728 };
3729 3729
3730 IN_PROC_BROWSER_TEST_F(SSLBlockingPageIDNTest, SSLBlockingPageDecodesIDN) { 3730 // Flaky on mac: https://crbug.com/689846
3731 #if defined(OS_MACOSX)
3732 #define MAYBE_SSLBlockingPageDecodesIDN DISABLED_SSLBlockingPageDecodesIDN
3733 #else
3734 #define MAYBE_SSLBlockingPageDecodesIDN SSLBlockingPageDecodesIDN
3735 #endif
3736
3737 IN_PROC_BROWSER_TEST_F(SSLBlockingPageIDNTest,
3738 MAYBE_SSLBlockingPageDecodesIDN) {
3731 EXPECT_TRUE(VerifyIDNDecoded()); 3739 EXPECT_TRUE(VerifyIDNDecoded());
3732 } 3740 }
3733 3741
3734 IN_PROC_BROWSER_TEST_F(CertVerifierBrowserTest, MockCertVerifierSmokeTest) { 3742 IN_PROC_BROWSER_TEST_F(CertVerifierBrowserTest, MockCertVerifierSmokeTest) {
3735 net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); 3743 net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
3736 https_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); 3744 https_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot));
3737 ASSERT_TRUE(https_server.Start()); 3745 ASSERT_TRUE(https_server.Start());
3738 3746
3739 mock_cert_verifier()->set_default_result( 3747 mock_cert_verifier()->set_default_result(
3740 net::ERR_CERT_NAME_CONSTRAINT_VIOLATION); 3748 net::ERR_CERT_NAME_CONSTRAINT_VIOLATION);
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
4209 4217
4210 // Visit a page over https that contains a frame with a redirect. 4218 // Visit a page over https that contains a frame with a redirect.
4211 4219
4212 // XMLHttpRequest insecure content in synchronous mode. 4220 // XMLHttpRequest insecure content in synchronous mode.
4213 4221
4214 // XMLHttpRequest insecure content in asynchronous mode. 4222 // XMLHttpRequest insecure content in asynchronous mode.
4215 4223
4216 // XMLHttpRequest over bad ssl in synchronous mode. 4224 // XMLHttpRequest over bad ssl in synchronous mode.
4217 4225
4218 // XMLHttpRequest over OK ssl in synchronous mode. 4226 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698