| Index: net/socket/socket_test_util.cc
|
| diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
|
| index 4b263de33b58feec7856acec2a79476ce4be9448..15c26f8c028cf0bbfe7faabed5c2ac480fae0108 100644
|
| --- a/net/socket/socket_test_util.cc
|
| +++ b/net/socket/socket_test_util.cc
|
| @@ -26,6 +26,7 @@
|
| #include "net/http/http_network_session.h"
|
| #include "net/http/http_request_headers.h"
|
| #include "net/http/http_response_headers.h"
|
| +#include "net/log/net_log_source.h"
|
| #include "net/log/net_log_source_type.h"
|
| #include "net/socket/socket.h"
|
| #include "net/socket/websocket_endpoint_lock_manager.h"
|
| @@ -711,7 +712,7 @@ MockClientSocketFactory::CreateDatagramClientSocket(
|
| DatagramSocket::BindType bind_type,
|
| const RandIntCallback& rand_int_cb,
|
| NetLog* net_log,
|
| - const NetLog::Source& source) {
|
| + const NetLogSource& source) {
|
| SocketDataProvider* data_provider = mock_data_.GetNext();
|
| std::unique_ptr<MockUDPClientSocket> socket(
|
| new MockUDPClientSocket(data_provider, net_log));
|
| @@ -727,7 +728,7 @@ MockClientSocketFactory::CreateTransportClientSocket(
|
| const AddressList& addresses,
|
| std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
|
| NetLog* net_log,
|
| - const NetLog::Source& source) {
|
| + const NetLogSource& source) {
|
| SocketDataProvider* data_provider = mock_data_.GetNext();
|
| std::unique_ptr<MockTCPClientSocket> socket(
|
| new MockTCPClientSocket(addresses, net_log, data_provider));
|
| @@ -1631,7 +1632,7 @@ int MockTransportClientSocketPool::RequestSocket(
|
| last_request_priority_ = priority;
|
| std::unique_ptr<StreamSocket> socket =
|
| client_socket_factory_->CreateTransportClientSocket(
|
| - AddressList(), NULL, net_log.net_log(), NetLog::Source());
|
| + AddressList(), NULL, net_log.net_log(), NetLogSource());
|
| MockConnectJob* job = new MockConnectJob(std::move(socket), handle, callback);
|
| job_list_.push_back(base::WrapUnique(job));
|
| handle->set_pool_id(1);
|
|
|