OLD | NEW |
---|---|
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 "net/socket/ssl_client_socket_pool.h" | 5 #include "net/socket/ssl_client_socket_pool.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/metrics/field_trial.h" | 9 #include "base/metrics/field_trial.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
363 DCHECK(!connect_timing_.ssl_start.is_null()); | 363 DCHECK(!connect_timing_.ssl_start.is_null()); |
364 base::TimeDelta connect_duration = | 364 base::TimeDelta connect_duration = |
365 connect_timing_.ssl_end - connect_timing_.ssl_start; | 365 connect_timing_.ssl_end - connect_timing_.ssl_start; |
366 if (using_spdy) { | 366 if (using_spdy) { |
367 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SpdyConnectionLatency_2", | 367 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SpdyConnectionLatency_2", |
368 connect_duration, | 368 connect_duration, |
369 base::TimeDelta::FromMilliseconds(1), | 369 base::TimeDelta::FromMilliseconds(1), |
370 base::TimeDelta::FromMinutes(1), | 370 base::TimeDelta::FromMinutes(1), |
371 100); | 371 100); |
372 } | 372 } |
373 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
374 bool using_data_reduction_proxy = params_->host_and_port().Equals( | |
375 HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN))); | |
376 if (using_data_reduction_proxy) { | |
377 UMA_HISTOGRAM_CUSTOM_TIMES( | |
378 "Net.SSL_Connection_Latency_DataReductionProxy", | |
Alexei Svitkine (slow)
2014/07/21 20:25:35
Can you mark this histogram as deprecated in histo
Not at Google. Contact bengr
2014/07/21 21:45:09
Done.
| |
379 connect_duration, | |
380 base::TimeDelta::FromMilliseconds(1), | |
381 base::TimeDelta::FromMinutes(1), | |
382 100); | |
383 } | |
384 #endif | |
385 | 373 |
386 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_2", | 374 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_2", |
387 connect_duration, | 375 connect_duration, |
388 base::TimeDelta::FromMilliseconds(1), | 376 base::TimeDelta::FromMilliseconds(1), |
389 base::TimeDelta::FromMinutes(1), | 377 base::TimeDelta::FromMinutes(1), |
390 100); | 378 100); |
391 | 379 |
392 SSLInfo ssl_info; | 380 SSLInfo ssl_info; |
393 ssl_socket_->GetSSLInfo(&ssl_info); | 381 ssl_socket_->GetSSLInfo(&ssl_info); |
394 | 382 |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
677 if (base_.CloseOneIdleSocket()) | 665 if (base_.CloseOneIdleSocket()) |
678 return true; | 666 return true; |
679 return base_.CloseOneIdleConnectionInHigherLayeredPool(); | 667 return base_.CloseOneIdleConnectionInHigherLayeredPool(); |
680 } | 668 } |
681 | 669 |
682 void SSLClientSocketPool::OnSSLConfigChanged() { | 670 void SSLClientSocketPool::OnSSLConfigChanged() { |
683 FlushWithError(ERR_NETWORK_CHANGED); | 671 FlushWithError(ERR_NETWORK_CHANGED); |
684 } | 672 } |
685 | 673 |
686 } // namespace net | 674 } // namespace net |
OLD | NEW |