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 fbbc2e28b95616223d9326bb6ccd924cba6bec94..d71ac60ce810d9a05d046f4892d231c71b89958e 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -61,6 +61,7 @@ |
#include "net/http/http_transaction_test_util.h" |
#include "net/log/net_log.h" |
#include "net/log/net_log_event_type.h" |
+#include "net/log/net_log_source.h" |
#include "net/log/test_net_log.h" |
#include "net/log/test_net_log_entry.h" |
#include "net/log/test_net_log_util.h" |
@@ -158,7 +159,7 @@ bool GetHeaders(base::DictionaryValue* params, std::string* headers) { |
// used. |
void TestLoadTimingReused(const LoadTimingInfo& load_timing_info) { |
EXPECT_TRUE(load_timing_info.socket_reused); |
- EXPECT_NE(NetLog::Source::kInvalidId, load_timing_info.socket_log_id); |
+ EXPECT_NE(NetLogSource::kInvalidId, load_timing_info.socket_log_id); |
EXPECT_TRUE(load_timing_info.proxy_resolve_start.is_null()); |
EXPECT_TRUE(load_timing_info.proxy_resolve_end.is_null()); |
@@ -179,7 +180,7 @@ void TestLoadTimingReused(const LoadTimingInfo& load_timing_info) { |
void TestLoadTimingNotReused(const LoadTimingInfo& load_timing_info, |
int connect_timing_flags) { |
EXPECT_FALSE(load_timing_info.socket_reused); |
- EXPECT_NE(NetLog::Source::kInvalidId, load_timing_info.socket_log_id); |
+ EXPECT_NE(NetLogSource::kInvalidId, load_timing_info.socket_log_id); |
EXPECT_TRUE(load_timing_info.proxy_resolve_start.is_null()); |
EXPECT_TRUE(load_timing_info.proxy_resolve_end.is_null()); |
@@ -201,7 +202,7 @@ void TestLoadTimingNotReused(const LoadTimingInfo& load_timing_info, |
// used. |
void TestLoadTimingReusedWithPac(const LoadTimingInfo& load_timing_info) { |
EXPECT_TRUE(load_timing_info.socket_reused); |
- EXPECT_NE(NetLog::Source::kInvalidId, load_timing_info.socket_log_id); |
+ EXPECT_NE(NetLogSource::kInvalidId, load_timing_info.socket_log_id); |
ExpectConnectTimingHasNoTimes(load_timing_info.connect_timing); |
@@ -223,7 +224,7 @@ void TestLoadTimingReusedWithPac(const LoadTimingInfo& load_timing_info) { |
void TestLoadTimingNotReusedWithPac(const LoadTimingInfo& load_timing_info, |
int connect_timing_flags) { |
EXPECT_FALSE(load_timing_info.socket_reused); |
- EXPECT_NE(NetLog::Source::kInvalidId, load_timing_info.socket_log_id); |
+ EXPECT_NE(NetLogSource::kInvalidId, load_timing_info.socket_log_id); |
EXPECT_FALSE(load_timing_info.proxy_resolve_start.is_null()); |
EXPECT_LE(load_timing_info.proxy_resolve_start, |
@@ -1399,7 +1400,7 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( |
"hello", "world" |
}; |
- uint32_t first_socket_log_id = NetLog::Source::kInvalidId; |
+ uint32_t first_socket_log_id = NetLogSource::kInvalidId; |
for (int i = 0; i < 2; ++i) { |
TestCompletionCallback callback; |
@@ -1839,7 +1840,7 @@ TEST_F(HttpNetworkTransactionTest, KeepAliveAfterUnreadBody) { |
const int kNumUnreadBodies = arraysize(data_writes) - 1; |
std::string response_lines[kNumUnreadBodies]; |
- uint32_t first_socket_log_id = NetLog::Source::kInvalidId; |
+ uint32_t first_socket_log_id = NetLogSource::kInvalidId; |
for (size_t i = 0; i < kNumUnreadBodies; ++i) { |
TestCompletionCallback callback; |
@@ -7626,7 +7627,7 @@ TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaHttpsProxy) { |
EXPECT_TRUE(trans.GetLoadTimingInfo(&load_timing_info)); |
EXPECT_FALSE(load_timing_info.socket_reused); |
- EXPECT_NE(NetLog::Source::kInvalidId, load_timing_info.socket_log_id); |
+ EXPECT_NE(NetLogSource::kInvalidId, load_timing_info.socket_log_id); |
EXPECT_FALSE(load_timing_info.proxy_resolve_start.is_null()); |
EXPECT_LE(load_timing_info.proxy_resolve_start, |