| Index: net/http/http_proxy_client_socket_pool_unittest.cc
|
| diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
|
| index d782c70349318f007e8c05c786e98548ae598fd2..ab6ef810b07d1aefc041f1c55e9df3d4737f7ca3 100644
|
| --- a/net/http/http_proxy_client_socket_pool_unittest.cc
|
| +++ b/net/http/http_proxy_client_socket_pool_unittest.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "base/test/histogram_tester.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/proxy_delegate.h"
|
| #include "net/base/test_completion_callback.h"
|
| @@ -191,6 +192,8 @@ class HttpProxyClientSocketPoolTest
|
| return transport_socket_pool_.last_request_priority();
|
| }
|
|
|
| + const base::HistogramTester& histogram_tester() { return histogram_tester_; }
|
| +
|
| private:
|
| SpdySessionDependencies session_deps_;
|
|
|
| @@ -201,6 +204,8 @@ class HttpProxyClientSocketPoolTest
|
|
|
| std::unique_ptr<HttpNetworkSession> session_;
|
|
|
| + base::HistogramTester histogram_tester_;
|
| +
|
| protected:
|
| SpdyTestUtil spdy_util_;
|
| std::unique_ptr<SSLSocketDataProvider> ssl_data_;
|
| @@ -230,6 +235,12 @@ TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) {
|
| EXPECT_FALSE(proxy_delegate->on_before_tunnel_request_called());
|
| EXPECT_FALSE(proxy_delegate->on_tunnel_headers_received_called());
|
| EXPECT_TRUE(proxy_delegate->on_tunnel_request_completed_called());
|
| +
|
| + bool is_secure_proxy = GetParam() == HTTPS || GetParam() == SPDY;
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Insecure.Success", is_secure_proxy ? 0 : 1);
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Secure.Success", is_secure_proxy ? 1 : 0);
|
| }
|
|
|
| // Make sure that HttpProxyConnectJob passes on its priority to its
|
| @@ -440,6 +451,12 @@ TEST_P(HttpProxyClientSocketPoolTest, TCPError) {
|
|
|
| EXPECT_FALSE(handle_.is_initialized());
|
| EXPECT_FALSE(handle_.socket());
|
| +
|
| + bool is_secure_proxy = GetParam() == HTTPS;
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Insecure.Error", is_secure_proxy ? 0 : 1);
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Secure.Error", is_secure_proxy ? 1 : 0);
|
| }
|
|
|
| TEST_P(HttpProxyClientSocketPoolTest, SSLError) {
|
| @@ -468,6 +485,10 @@ TEST_P(HttpProxyClientSocketPoolTest, SSLError) {
|
|
|
| EXPECT_FALSE(handle_.is_initialized());
|
| EXPECT_FALSE(handle_.socket());
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Secure.Error", 1);
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Insecure.Error", 0);
|
| }
|
|
|
| TEST_P(HttpProxyClientSocketPoolTest, SslClientAuth) {
|
| @@ -496,6 +517,10 @@ TEST_P(HttpProxyClientSocketPoolTest, SslClientAuth) {
|
|
|
| EXPECT_FALSE(handle_.is_initialized());
|
| EXPECT_FALSE(handle_.socket());
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Secure.Error", 1);
|
| + histogram_tester().ExpectTotalCount(
|
| + "Net.HttpProxy.ConnectLatency.Insecure.Error", 0);
|
| }
|
|
|
| TEST_P(HttpProxyClientSocketPoolTest, TunnelUnexpectedClose) {
|
|
|