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 44e200ce6ce3b5317785a293eed85804b1db97e0..966dab90c8f14c0f23aa93df369e5c006861c729 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -50,6 +50,7 @@ |
#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/captured_net_log_entry.h" |
#include "net/log/net_log.h" |
#include "net/log/net_log_unittest.h" |
#include "net/log/test_net_log.h" |
@@ -354,7 +355,7 @@ class HttpNetworkTransactionTest |
rv = ReadTransaction(trans.get(), &out.response_data); |
EXPECT_EQ(OK, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS, |
@@ -2448,7 +2449,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAliveHttp10) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -2567,7 +2568,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAliveHttp11) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -2683,7 +2684,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyKeepAliveHttp10) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -2788,7 +2789,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyKeepAliveHttp11) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -3051,7 +3052,7 @@ TEST_P(HttpNetworkTransactionTest, |
rv = callback1.WaitForResult(); |
EXPECT_EQ(ERR_UNEXPECTED_PROXY_AUTH, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -6841,7 +6842,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthSpdyProxy) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -10905,7 +10906,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyTunnelGet) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(OK, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |
@@ -10979,7 +10980,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyTunnelGetHangup) { |
rv = callback1.WaitForResult(); |
EXPECT_EQ(ERR_EMPTY_RESPONSE, rv); |
- TestNetLog::CapturedEntryList entries; |
+ CapturedNetLogEntry::List entries; |
log.GetEntries(&entries); |
size_t pos = ExpectLogContainsSomewhere( |
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, |