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

Side by Side Diff: net/socket/ssl_client_socket_impl.h

Issue 2243453002: Replace SSLProtocolNegotiation histogram with SSLNegotiatedAlpnProtocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
7 7
8 #include <openssl/base.h> 8 #include <openssl/base.h>
9 #include <openssl/ssl.h> 9 #include <openssl/ssl.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 int TokenBindingAdd(const uint8_t** out, 234 int TokenBindingAdd(const uint8_t** out,
235 size_t* out_len, 235 size_t* out_len,
236 int* out_alert_value); 236 int* out_alert_value);
237 int TokenBindingParse(const uint8_t* contents, 237 int TokenBindingParse(const uint8_t* contents,
238 size_t contents_len, 238 size_t contents_len,
239 int* out_alert_value); 239 int* out_alert_value);
240 240
241 void LogConnectEndEvent(int rv); 241 void LogConnectEndEvent(int rv);
242 242
243 // Record which TLS extension was used to negotiate protocol and protocol 243 // Record whether ALPN was used, and if so, the negotiated protocol,
244 // chosen in a UMA histogram. 244 // in a UMA histogram.
245 void RecordNegotiationExtension() const; 245 void RecordNegotiatedProtocol() const;
246 246
247 // Records histograms for channel id support during full handshakes - resumed 247 // Records histograms for channel id support during full handshakes - resumed
248 // handshakes are ignored. 248 // handshakes are ignored.
249 void RecordChannelIDSupport() const; 249 void RecordChannelIDSupport() const;
250 250
251 // Returns whether TLS channel ID is enabled. 251 // Returns whether TLS channel ID is enabled.
252 bool IsChannelIDEnabled() const; 252 bool IsChannelIDEnabled() const;
253 253
254 bool transport_send_busy_; 254 bool transport_send_busy_;
255 bool transport_recv_busy_; 255 bool transport_recv_busy_;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 // True if PKP is bypassed due to a local trust anchor. 384 // True if PKP is bypassed due to a local trust anchor.
385 bool pkp_bypassed_; 385 bool pkp_bypassed_;
386 386
387 BoundNetLog net_log_; 387 BoundNetLog net_log_;
388 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_; 388 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_;
389 }; 389 };
390 390
391 } // namespace net 391 } // namespace net
392 392
393 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 393 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698