Index: net/http/http_network_transaction_unittest.cc |
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc |
index 6c59954575dcda26c39faff24f96a32f756a3b97..7cb48114ae347f758a59a56d28db5af68cf28acf 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -50,9 +50,9 @@ |
#include "net/http/http_stream_factory.h" |
#include "net/http/http_stream_parser.h" |
#include "net/http/http_transaction_test_util.h" |
-#include "net/log/capturing_net_log.h" |
#include "net/log/net_log.h" |
#include "net/log/net_log_unittest.h" |
+#include "net/log/test_net_log.h" |
#include "net/proxy/mock_proxy_resolver.h" |
#include "net/proxy/proxy_config_service_fixed.h" |
#include "net/proxy/proxy_info.h" |
@@ -358,7 +358,7 @@ class HttpNetworkTransactionTest |
rv = ReadTransaction(trans.get(), &out.response_data); |
EXPECT_EQ(OK, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS, |
@@ -1273,7 +1273,7 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( |
request.url = GURL("http://www.foo.com/"); |
request.load_flags = 0; |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -1363,7 +1363,7 @@ void HttpNetworkTransactionTest::PreconnectErrorResendRequestTest( |
request.url = GURL("https://www.foo.com/"); |
request.load_flags = 0; |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -1777,7 +1777,7 @@ TEST_P(HttpNetworkTransactionTest, KeepAliveAfterUnreadBody) { |
request.url = GURL("http://www.foo.com/"); |
request.load_flags = 0; |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -1886,7 +1886,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuth) { |
request.url = GURL("http://www.google.com/"); |
request.load_flags = 0; |
- CapturingNetLog log; |
+ TestNetLog log; |
session_deps_.net_log = &log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
scoped_ptr<HttpTransaction> trans( |
@@ -2033,7 +2033,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthKeepAlive) { |
request.url = GURL("http://www.google.com/"); |
request.load_flags = 0; |
- CapturingNetLog log; |
+ TestNetLog log; |
session_deps_.net_log = &log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -2439,7 +2439,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAliveHttp10) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -2555,7 +2555,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAliveHttp11) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -2671,7 +2671,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyKeepAliveHttp10) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -2774,7 +2774,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyKeepAliveHttp11) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -3033,7 +3033,7 @@ TEST_P(HttpNetworkTransactionTest, |
rv = callback1.WaitForResult(); |
EXPECT_EQ(ERR_UNEXPECTED_PROXY_AUTH, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -6374,7 +6374,7 @@ TEST_P(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { |
TEST_P(HttpNetworkTransactionTest, HTTPSViaHttpsProxy) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("HTTPS proxy:70")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
HttpRequestInfo request; |
@@ -6438,7 +6438,7 @@ TEST_P(HttpNetworkTransactionTest, HTTPSViaHttpsProxy) { |
TEST_P(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaHttpsProxy) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("HTTPS proxy:70")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
HttpRequestInfo request; |
@@ -6771,7 +6771,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthSpdyProxy) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -7498,7 +7498,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("SOCKS myproxy:1080")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -7557,7 +7557,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS4_SSL_GET) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("SOCKS myproxy:1080")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -7621,7 +7621,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS4_HTTP_GET_no_PAC) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixed("socks4://myproxy:1080")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -7680,7 +7680,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("SOCKS5 myproxy:1080")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -7753,7 +7753,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS5_SSL_GET) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("SOCKS5 myproxy:1080")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
@@ -9524,7 +9524,7 @@ TEST_P(HttpNetworkTransactionTest, |
make_scoped_ptr( |
new ForwardingProxyResolverFactory(&capturing_proxy_resolver)), |
NULL)); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
HttpRequestInfo request; |
@@ -10455,7 +10455,7 @@ TEST_P(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
- CapturingNetLog net_log; |
+ TestNetLog net_log; |
session_deps_.net_log = &net_log; |
GURL request_url; |
{ |
@@ -10808,7 +10808,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyTunnelGet) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -10880,7 +10880,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyTunnelGetHangup) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(ERR_EMPTY_RESPONSE, rv); |
- net::CapturingNetLog::CapturedEntryList entries; |
+ net::TestNetLog::CapturedEntryList entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -11819,7 +11819,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttpOverTunnel) { |
session_deps_.proxy_service.reset( |
ProxyService::CreateFixedFromPacResult("HTTPS proxy:70")); |
- CapturingNetLog log; |
+ TestNetLog log; |
session_deps_.net_log = &log; |
SSLSocketDataProvider ssl1(ASYNC, OK); // to the proxy |
ssl1.SetNextProto(GetParam()); |