| 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 c8032e694b7a240a51148169c1528314e729d543..e3dc35950a72b438e1332afe0333784b85171095 100644
|
| --- a/net/socket/socks_client_socket_unittest.cc
|
| +++ b/net/socket/socks_client_socket_unittest.cc
|
| @@ -101,7 +101,7 @@ class HangingHostResolverWithCancel : public HostResolver {
|
| AddressList* addresses,
|
| const CompletionCallback& callback,
|
| RequestHandle* out_req,
|
| - const BoundNetLog& net_log) OVERRIDE {
|
| + const BoundNetLog& net_log) override {
|
| DCHECK(addresses);
|
| DCHECK_EQ(false, callback.is_null());
|
| EXPECT_FALSE(HasOutstandingRequest());
|
| @@ -112,12 +112,12 @@ class HangingHostResolverWithCancel : public HostResolver {
|
|
|
| virtual int ResolveFromCache(const RequestInfo& info,
|
| AddressList* addresses,
|
| - const BoundNetLog& net_log) OVERRIDE {
|
| + const BoundNetLog& net_log) override {
|
| NOTIMPLEMENTED();
|
| return ERR_UNEXPECTED;
|
| }
|
|
|
| - virtual void CancelRequest(RequestHandle req) OVERRIDE {
|
| + virtual void CancelRequest(RequestHandle req) override {
|
| EXPECT_TRUE(HasOutstandingRequest());
|
| EXPECT_EQ(outstanding_request_, req);
|
| outstanding_request_ = NULL;
|
|
|