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

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

Issue 2303413002: Simplify security_interstitials::ControllerClient and other related classes (Closed)
Patch Set: Rebase 2 Created 4 years, 2 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
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 3059 matching lines...) Expand 10 before | Expand all | Expand 10 after
3070 3070
3071 class SSLBlockingPageIDNTest : public SecurityInterstitialIDNTest { 3071 class SSLBlockingPageIDNTest : public SecurityInterstitialIDNTest {
3072 protected: 3072 protected:
3073 // SecurityInterstitialIDNTest implementation 3073 // SecurityInterstitialIDNTest implementation
3074 SecurityInterstitialPage* CreateInterstitial( 3074 SecurityInterstitialPage* CreateInterstitial(
3075 content::WebContents* contents, 3075 content::WebContents* contents,
3076 const GURL& request_url) const override { 3076 const GURL& request_url) const override {
3077 net::SSLInfo ssl_info; 3077 net::SSLInfo ssl_info;
3078 ssl_info.cert = 3078 ssl_info.cert =
3079 net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem"); 3079 net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
3080 return new SSLBlockingPage( 3080 return SSLBlockingPage::Create(
3081 contents, net::ERR_CERT_CONTAINS_ERRORS, ssl_info, request_url, 0, 3081 contents, net::ERR_CERT_CONTAINS_ERRORS, ssl_info, request_url, 0,
3082 base::Time::NowFromSystemTime(), nullptr, 3082 base::Time::NowFromSystemTime(), nullptr,
3083 base::Callback<void(content::CertificateRequestResultType)>()); 3083 base::Callback<void(content::CertificateRequestResultType)>());
3084 } 3084 }
3085 }; 3085 };
3086 3086
3087 IN_PROC_BROWSER_TEST_F(SSLBlockingPageIDNTest, SSLBlockingPageDecodesIDN) { 3087 IN_PROC_BROWSER_TEST_F(SSLBlockingPageIDNTest, SSLBlockingPageDecodesIDN) {
3088 EXPECT_TRUE(VerifyIDNDecoded()); 3088 EXPECT_TRUE(VerifyIDNDecoded());
3089 } 3089 }
3090 3090
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
3282 3282
3283 // Visit a page over https that contains a frame with a redirect. 3283 // Visit a page over https that contains a frame with a redirect.
3284 3284
3285 // XMLHttpRequest insecure content in synchronous mode. 3285 // XMLHttpRequest insecure content in synchronous mode.
3286 3286
3287 // XMLHttpRequest insecure content in asynchronous mode. 3287 // XMLHttpRequest insecure content in asynchronous mode.
3288 3288
3289 // XMLHttpRequest over bad ssl in synchronous mode. 3289 // XMLHttpRequest over bad ssl in synchronous mode.
3290 3290
3291 // XMLHttpRequest over OK ssl in synchronous mode. 3291 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698