| Index: net/socket/transport_client_socket_pool_test_util.cc
|
| diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc
|
| index 3c02384053b91423e2e08680086e3f70a25c8b59..4482fad79359d32331513c7c64c60ac7e541ff96 100644
|
| --- a/net/socket/transport_client_socket_pool_test_util.cc
|
| +++ b/net/socket/transport_client_socket_pool_test_util.cc
|
| @@ -19,7 +19,9 @@
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/base/load_timing_info.h"
|
| #include "net/base/load_timing_info_test_util.h"
|
| +#include "net/log/net_log_source.h"
|
| #include "net/log/net_log_source_type.h"
|
| +#include "net/log/net_log_with_source.h"
|
| #include "net/socket/client_socket_handle.h"
|
| #include "net/socket/ssl_client_socket.h"
|
| #include "net/udp/datagram_client_socket.h"
|
| @@ -317,7 +319,7 @@ void TestLoadTimingInfoConnectedReused(const ClientSocketHandle& handle) {
|
| EXPECT_TRUE(handle.GetLoadTimingInfo(true, &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);
|
| ExpectLoadTimingHasOnlyConnectionTimes(load_timing_info);
|
| @@ -330,7 +332,7 @@ void TestLoadTimingInfoConnectedNotReused(const ClientSocketHandle& handle) {
|
| EXPECT_TRUE(handle.GetLoadTimingInfo(false, &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);
|
|
|
| ExpectConnectTimingHasTimes(load_timing_info.connect_timing,
|
| CONNECT_TIMING_HAS_DNS_TIMES);
|
| @@ -365,7 +367,7 @@ MockTransportClientSocketFactory::CreateDatagramClientSocket(
|
| DatagramSocket::BindType bind_type,
|
| const RandIntCallback& rand_int_cb,
|
| NetLog* net_log,
|
| - const NetLog::Source& source) {
|
| + const NetLogSource& source) {
|
| NOTREACHED();
|
| return std::unique_ptr<DatagramClientSocket>();
|
| }
|
| @@ -375,7 +377,7 @@ MockTransportClientSocketFactory::CreateTransportClientSocket(
|
| const AddressList& addresses,
|
| std::unique_ptr<SocketPerformanceWatcher> /* socket_performance_watcher */,
|
| NetLog* /* net_log */,
|
| - const NetLog::Source& /* source */) {
|
| + const NetLogSource& /* source */) {
|
| allocation_count_++;
|
|
|
| ClientSocketType type = client_socket_type_;
|
|
|