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

Side by Side Diff: net/http/http_network_transaction.h

Issue 14125003: Do not roll back to SSL 3.0 for Google properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 7 years, 8 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 | « chrome/common/pref_names.cc ('k') | net/http/http_network_transaction.cc » ('j') | 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 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const ProxyInfo& used_proxy_info, 80 const ProxyInfo& used_proxy_info,
81 HttpAuthController* auth_controller) OVERRIDE; 81 HttpAuthController* auth_controller) OVERRIDE;
82 virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config, 82 virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config,
83 SSLCertRequestInfo* cert_info) OVERRIDE; 83 SSLCertRequestInfo* cert_info) OVERRIDE;
84 virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info, 84 virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info,
85 const SSLConfig& used_ssl_config, 85 const SSLConfig& used_ssl_config,
86 const ProxyInfo& used_proxy_info, 86 const ProxyInfo& used_proxy_info,
87 HttpStreamBase* stream) OVERRIDE; 87 HttpStreamBase* stream) OVERRIDE;
88 88
89 private: 89 private:
90 friend class HttpNetworkTransactionSSLTest;
91
90 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy2Test, 92 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy2Test,
91 ResetStateForRestart); 93 ResetStateForRestart);
92 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy3Test, 94 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy3Test,
93 ResetStateForRestart); 95 ResetStateForRestart);
94 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test, 96 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
95 WindowUpdateReceived); 97 WindowUpdateReceived);
96 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test, 98 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
97 WindowUpdateSent); 99 WindowUpdateSent);
98 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test, 100 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
99 WindowUpdateOverflow); 101 WindowUpdateOverflow);
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 // True when the tunnel is in the process of being established - we can't 310 // True when the tunnel is in the process of being established - we can't
309 // read from the socket until the tunnel is done. 311 // read from the socket until the tunnel is done.
310 bool establishing_tunnel_; 312 bool establishing_tunnel_;
311 313
312 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction); 314 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
313 }; 315 };
314 316
315 } // namespace net 317 } // namespace net
316 318
317 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 319 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « chrome/common/pref_names.cc ('k') | net/http/http_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698