| Index: net/socket/socks5_client_socket.h
|
| ===================================================================
|
| --- net/socket/socks5_client_socket.h (revision 41560)
|
| +++ net/socket/socks5_client_socket.h (working copy)
|
| @@ -15,12 +15,13 @@
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/host_resolver.h"
|
| #include "net/base/net_errors.h"
|
| +#include "net/base/net_log.h"
|
| #include "net/socket/client_socket.h"
|
| #include "testing/gtest/include/gtest/gtest_prod.h"
|
|
|
| namespace net {
|
|
|
| -class LoadLog;
|
| +class BoundNetLog;
|
|
|
| // This ClientSocket is used to setup a SOCKSv5 handshake with a socks proxy.
|
| // Currently no SOCKSv5 authentication is supported.
|
| @@ -44,7 +45,7 @@
|
| // ClientSocket methods:
|
|
|
| // Does the SOCKS handshake and completes the protocol.
|
| - virtual int Connect(CompletionCallback* callback, LoadLog* load_log);
|
| + virtual int Connect(CompletionCallback* callback, const BoundNetLog& net_log);
|
| virtual void Disconnect();
|
| virtual bool IsConnected() const;
|
| virtual bool IsConnectedAndIdle() const;
|
| @@ -133,7 +134,7 @@
|
|
|
| HostResolver::RequestInfo host_request_info_;
|
|
|
| - scoped_refptr<LoadLog> load_log_;
|
| + BoundNetLog net_log_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocket);
|
| };
|
|
|