Index: net/socket/ssl_client_socket_pool.cc |
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc |
index 7734d64cc3d991ef53579f8e6c05ece456bed938..2265e0071c052b193a874d7dad5956b923316247 100644 |
--- a/net/socket/ssl_client_socket_pool.cc |
+++ b/net/socket/ssl_client_socket_pool.cc |
@@ -476,6 +476,10 @@ int SSLConnectJob::DoSSLConnectComplete(int result) { |
bool using_spdy = params_->force_spdy_over_ssl() || |
params_->want_spdy_over_npn(); |
+ const std::string& host = params_->host_and_port().host(); |
+ bool is_google = |
+ host == "google.com" || |
+ (host.size() > 11 && host.rfind(".google.com") == host.size() - 11); |
Alexei Svitkine (slow)
2015/02/06 22:44:01
Can this use google_util::IsGoogleHostname() too?
jeremyim
2015/02/06 22:47:22
Unfortunately, I believe that's a layering violati
Ryan Sleevi
2015/02/07 00:20:56
Correct.
I mean, this is a layering violation as
jeremyim
2015/02/07 03:24:29
This change has been reverted. Back to using 2 boo
|
if (result == OK || |
ssl_socket_->IgnoreCertError(result, params_->load_flags())) { |
DCHECK(!connect_timing_.ssl_start.is_null()); |
@@ -521,10 +525,6 @@ int SSLConnectJob::DoSSLConnectComplete(int result) { |
100); |
} |
- const std::string& host = params_->host_and_port().host(); |
- bool is_google = |
- host == "google.com" || |
- (host.size() > 11 && host.rfind(".google.com") == host.size() - 11); |
if (is_google) { |
UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Google2", |
connect_duration, |
@@ -557,6 +557,12 @@ int SSLConnectJob::DoSSLConnectComplete(int result) { |
error_response_info_.cert_request_info.get()); |
} |
+ UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(result)); |
+ if (is_google) { |
+ UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error_Google", |
+ std::abs(result)); |
+ } |
+ |
return result; |
} |