| Index: net/socket/socks_client_socket_unittest.cc
|
| diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
|
| index 84aaf6fb08d5e0e4a74ca8e1e47b4ba3040b4940..ced7d9e4d07be35e258c734f858c775d0f6093ad 100644
|
| --- a/net/socket/socks_client_socket_unittest.cc
|
| +++ b/net/socket/socks_client_socket_unittest.cc
|
| @@ -96,12 +96,12 @@ class HangingHostResolverWithCancel : public HostResolver {
|
| public:
|
| HangingHostResolverWithCancel() : outstanding_request_(NULL) {}
|
|
|
| - virtual int Resolve(const RequestInfo& info,
|
| - RequestPriority priority,
|
| - AddressList* addresses,
|
| - const CompletionCallback& callback,
|
| - RequestHandle* out_req,
|
| - const BoundNetLog& net_log) override {
|
| + int Resolve(const RequestInfo& info,
|
| + RequestPriority priority,
|
| + AddressList* addresses,
|
| + const CompletionCallback& callback,
|
| + RequestHandle* out_req,
|
| + const BoundNetLog& net_log) override {
|
| DCHECK(addresses);
|
| DCHECK_EQ(false, callback.is_null());
|
| EXPECT_FALSE(HasOutstandingRequest());
|
| @@ -110,14 +110,14 @@ class HangingHostResolverWithCancel : public HostResolver {
|
| return ERR_IO_PENDING;
|
| }
|
|
|
| - virtual int ResolveFromCache(const RequestInfo& info,
|
| - AddressList* addresses,
|
| - const BoundNetLog& net_log) override {
|
| + int ResolveFromCache(const RequestInfo& info,
|
| + AddressList* addresses,
|
| + const BoundNetLog& net_log) override {
|
| NOTIMPLEMENTED();
|
| return ERR_UNEXPECTED;
|
| }
|
|
|
| - virtual void CancelRequest(RequestHandle req) override {
|
| + void CancelRequest(RequestHandle req) override {
|
| EXPECT_TRUE(HasOutstandingRequest());
|
| EXPECT_EQ(outstanding_request_, req);
|
| outstanding_request_ = NULL;
|
|
|