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

Side by Side Diff: components/cronet/url_request_context_config.h

Issue 2117763004: Revert of Enable public key pinning of local trust anchors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_ 5 #ifndef COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_
6 #define COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_ 6 #define COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 const std::string& data_reduction_proxy_key, 102 const std::string& data_reduction_proxy_key,
103 // Data reduction proxy. 103 // Data reduction proxy.
104 const std::string& data_reduction_primary_proxy, 104 const std::string& data_reduction_primary_proxy,
105 // Fallback data reduction proxy. 105 // Fallback data reduction proxy.
106 const std::string& data_reduction_fallback_proxy, 106 const std::string& data_reduction_fallback_proxy,
107 // Data reduction proxy secure proxy check URL. 107 // Data reduction proxy secure proxy check URL.
108 const std::string& data_reduction_secure_proxy_check_url, 108 const std::string& data_reduction_secure_proxy_check_url,
109 // MockCertVerifier to use for testing purposes. 109 // MockCertVerifier to use for testing purposes.
110 std::unique_ptr<net::CertVerifier> mock_cert_verifier, 110 std::unique_ptr<net::CertVerifier> mock_cert_verifier,
111 // Enable network quality estimator. 111 // Enable network quality estimator.
112 bool enable_network_quality_estimator, 112 bool enable_network_quality_estimator);
113 // Enable bypassing of public key pinning for local trust anchors
114 bool bypass_public_key_pinning_for_local_trust_anchors);
115 ~URLRequestContextConfig(); 113 ~URLRequestContextConfig();
116 114
117 // Configure |context_builder| based on |this|. 115 // Configure |context_builder| based on |this|.
118 void ConfigureURLRequestContextBuilder( 116 void ConfigureURLRequestContextBuilder(
119 net::URLRequestContextBuilder* context_builder, 117 net::URLRequestContextBuilder* context_builder,
120 net::NetLog* net_log, 118 net::NetLog* net_log,
121 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner); 119 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner);
122 120
123 // Enable QUIC. 121 // Enable QUIC.
124 const bool enable_quic; 122 const bool enable_quic;
(...skipping 26 matching lines...) Expand all
151 const std::string data_reduction_primary_proxy; 149 const std::string data_reduction_primary_proxy;
152 const std::string data_reduction_fallback_proxy; 150 const std::string data_reduction_fallback_proxy;
153 const std::string data_reduction_secure_proxy_check_url; 151 const std::string data_reduction_secure_proxy_check_url;
154 152
155 // Certificate verifier for testing. 153 // Certificate verifier for testing.
156 std::unique_ptr<net::CertVerifier> mock_cert_verifier; 154 std::unique_ptr<net::CertVerifier> mock_cert_verifier;
157 155
158 // Enable network quality estimator. 156 // Enable network quality estimator.
159 const bool enable_network_quality_estimator; 157 const bool enable_network_quality_estimator;
160 158
161 // Enable public key pinning bypass for local trust anchors.
162 const bool bypass_public_key_pinning_for_local_trust_anchors;
163
164 // App-provided list of servers that support QUIC. 159 // App-provided list of servers that support QUIC.
165 ScopedVector<QuicHint> quic_hints; 160 ScopedVector<QuicHint> quic_hints;
166 161
167 // The list of public key pins. 162 // The list of public key pins.
168 ScopedVector<Pkp> pkp_list; 163 ScopedVector<Pkp> pkp_list;
169 164
170 private: 165 private:
171 DISALLOW_COPY_AND_ASSIGN(URLRequestContextConfig); 166 DISALLOW_COPY_AND_ASSIGN(URLRequestContextConfig);
172 }; 167 };
173 168
174 } // namespace cronet 169 } // namespace cronet
175 170
176 #endif // COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_ 171 #endif // COMPONENTS_CRONET_URL_REQUEST_CONTEXT_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698