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

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

Issue 2724013002: net: remove CryptoModule class (Closed)
Patch Set: Created 3 years, 9 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #include "net/url_request/url_request_filter.h" 107 #include "net/url_request/url_request_filter.h"
108 #include "net/url_request/url_request_job.h" 108 #include "net/url_request/url_request_job.h"
109 #include "net/url_request/url_request_test_util.h" 109 #include "net/url_request/url_request_test_util.h"
110 110
111 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) 111 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
112 #include "chrome/browser/ssl/captive_portal_blocking_page.h" 112 #include "chrome/browser/ssl/captive_portal_blocking_page.h"
113 #endif 113 #endif
114 114
115 #if defined(USE_NSS_CERTS) 115 #if defined(USE_NSS_CERTS)
116 #include "chrome/browser/net/nss_context.h" 116 #include "chrome/browser/net/nss_context.h"
117 #include "net/base/crypto_module.h"
118 #include "net/cert/nss_cert_database.h" 117 #include "net/cert/nss_cert_database.h"
119 #endif // defined(USE_NSS_CERTS) 118 #endif // defined(USE_NSS_CERTS)
120 119
121 using base::ASCIIToUTF16; 120 using base::ASCIIToUTF16;
122 using chrome_browser_interstitials::SecurityInterstitialIDNTest; 121 using chrome_browser_interstitials::SecurityInterstitialIDNTest;
123 using content::InterstitialPage; 122 using content::InterstitialPage;
124 using content::NavigationController; 123 using content::NavigationController;
125 using content::NavigationEntry; 124 using content::NavigationEntry;
126 using content::SSLStatus; 125 using content::SSLStatus;
127 using content::WebContents; 126 using content::WebContents;
(...skipping 4276 matching lines...) Expand 10 before | Expand all | Expand 10 after
4404 4403
4405 // Visit a page over https that contains a frame with a redirect. 4404 // Visit a page over https that contains a frame with a redirect.
4406 4405
4407 // XMLHttpRequest insecure content in synchronous mode. 4406 // XMLHttpRequest insecure content in synchronous mode.
4408 4407
4409 // XMLHttpRequest insecure content in asynchronous mode. 4408 // XMLHttpRequest insecure content in asynchronous mode.
4410 4409
4411 // XMLHttpRequest over bad ssl in synchronous mode. 4410 // XMLHttpRequest over bad ssl in synchronous mode.
4412 4411
4413 // XMLHttpRequest over OK ssl in synchronous mode. 4412 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/platform_keys/platform_keys_nss.cc ('k') | chrome/browser/ui/crypto_module_password_dialog_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698