| Index: net/socket/socket_test_util.h
|
| diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
|
| index 066a1ac87384a0fdcd56453f82f1d46ab45bc549..4cc20d6296f392c2c2ea771c000c658c7c83ede3 100644
|
| --- a/net/socket/socket_test_util.h
|
| +++ b/net/socket/socket_test_util.h
|
| @@ -29,7 +29,7 @@
|
| #include "net/base/test_completion_callback.h"
|
| #include "net/http/http_auth_controller.h"
|
| #include "net/http/http_proxy_client_socket_pool.h"
|
| -#include "net/log/net_log.h"
|
| +#include "net/log/net_log_with_source.h"
|
| #include "net/socket/client_socket_factory.h"
|
| #include "net/socket/client_socket_handle.h"
|
| #include "net/socket/connection_attempts.h"
|
| @@ -48,6 +48,8 @@ class RunLoop;
|
|
|
| namespace net {
|
|
|
| +class NetLog;
|
| +
|
| const NetworkChangeNotifier::NetworkHandle kDefaultNetworkForTests = 1;
|
| const NetworkChangeNotifier::NetworkHandle kNewNetworkForTests = 2;
|
|
|
| @@ -517,12 +519,12 @@ class MockClientSocketFactory : public ClientSocketFactory {
|
| DatagramSocket::BindType bind_type,
|
| const RandIntCallback& rand_int_cb,
|
| NetLog* net_log,
|
| - const NetLog::Source& source) override;
|
| + const NetLogSource& source) override;
|
| std::unique_ptr<StreamSocket> CreateTransportClientSocket(
|
| const AddressList& addresses,
|
| std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
|
| NetLog* net_log,
|
| - const NetLog::Source& source) override;
|
| + const NetLogSource& source) override;
|
| std::unique_ptr<SSLClientSocket> CreateSSLClientSocket(
|
| std::unique_ptr<ClientSocketHandle> transport_socket,
|
| const HostPortPair& host_and_port,
|
|
|