| 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 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 DCHECK(!connect_timing_.ssl_start.is_null()); | 481 DCHECK(!connect_timing_.ssl_start.is_null()); |
| 482 base::TimeDelta connect_duration = | 482 base::TimeDelta connect_duration = |
| 483 connect_timing_.ssl_end - connect_timing_.ssl_start; | 483 connect_timing_.ssl_end - connect_timing_.ssl_start; |
| 484 if (using_spdy) { | 484 if (using_spdy) { |
| 485 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SpdyConnectionLatency_2", | 485 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SpdyConnectionLatency_2", |
| 486 connect_duration, | 486 connect_duration, |
| 487 base::TimeDelta::FromMilliseconds(1), | 487 base::TimeDelta::FromMilliseconds(1), |
| 488 base::TimeDelta::FromMinutes(1), | 488 base::TimeDelta::FromMinutes(1), |
| 489 100); | 489 100); |
| 490 } | 490 } |
| 491 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
| 492 bool using_data_reduction_proxy = params_->host_and_port().Equals( | |
| 493 HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN))); | |
| 494 if (using_data_reduction_proxy) { | |
| 495 UMA_HISTOGRAM_CUSTOM_TIMES( | |
| 496 "Net.SSL_Connection_Latency_DataReductionProxy", | |
| 497 connect_duration, | |
| 498 base::TimeDelta::FromMilliseconds(1), | |
| 499 base::TimeDelta::FromMinutes(1), | |
| 500 100); | |
| 501 } | |
| 502 #endif | |
| 503 | 491 |
| 504 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_2", | 492 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_2", |
| 505 connect_duration, | 493 connect_duration, |
| 506 base::TimeDelta::FromMilliseconds(1), | 494 base::TimeDelta::FromMilliseconds(1), |
| 507 base::TimeDelta::FromMinutes(1), | 495 base::TimeDelta::FromMinutes(1), |
| 508 100); | 496 100); |
| 509 | 497 |
| 510 SSLInfo ssl_info; | 498 SSLInfo ssl_info; |
| 511 ssl_socket_->GetSSLInfo(&ssl_info); | 499 ssl_socket_->GetSSLInfo(&ssl_info); |
| 512 | 500 |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 854 CHECK(it != messenger_map_.end()); | 842 CHECK(it != messenger_map_.end()); |
| 855 delete it->second; | 843 delete it->second; |
| 856 messenger_map_.erase(it); | 844 messenger_map_.erase(it); |
| 857 } | 845 } |
| 858 | 846 |
| 859 void SSLClientSocketPool::OnSSLConfigChanged() { | 847 void SSLClientSocketPool::OnSSLConfigChanged() { |
| 860 FlushWithError(ERR_NETWORK_CHANGED); | 848 FlushWithError(ERR_NETWORK_CHANGED); |
| 861 } | 849 } |
| 862 | 850 |
| 863 } // namespace net | 851 } // namespace net |
| OLD | NEW |