| Index: net/dns/mock_host_resolver.h
|
| diff --git a/net/dns/mock_host_resolver.h b/net/dns/mock_host_resolver.h
|
| index 3593fbdfe9183eaa1a8c3039cd79018ee746b469..9d5339f0d8c43209451673188095989dbda5340a 100644
|
| --- a/net/dns/mock_host_resolver.h
|
| +++ b/net/dns/mock_host_resolver.h
|
| @@ -79,12 +79,12 @@ class MockHostResolverBase : public HostResolver,
|
| AddressList* addresses,
|
| const CompletionCallback& callback,
|
| RequestHandle* out_req,
|
| - const BoundNetLog& net_log) OVERRIDE;
|
| + const BoundNetLog& net_log) override;
|
| virtual int ResolveFromCache(const RequestInfo& info,
|
| AddressList* addresses,
|
| - const BoundNetLog& net_log) OVERRIDE;
|
| - virtual void CancelRequest(RequestHandle req) OVERRIDE;
|
| - virtual HostCache* GetHostCache() OVERRIDE;
|
| + const BoundNetLog& net_log) override;
|
| + virtual void CancelRequest(RequestHandle req) override;
|
| + virtual HostCache* GetHostCache() override;
|
|
|
| // Resolves all pending requests. It is only valid to invoke this if
|
| // set_ondemand_mode was set before. The requests are resolved asynchronously,
|
| @@ -206,7 +206,7 @@ class RuleBasedHostResolverProc : public HostResolverProc {
|
| AddressFamily address_family,
|
| HostResolverFlags host_resolver_flags,
|
| AddressList* addrlist,
|
| - int* os_error) OVERRIDE;
|
| + int* os_error) override;
|
|
|
| private:
|
| struct Rule;
|
| @@ -228,11 +228,11 @@ class HangingHostResolver : public HostResolver {
|
| AddressList* addresses,
|
| const CompletionCallback& callback,
|
| RequestHandle* out_req,
|
| - const BoundNetLog& net_log) OVERRIDE;
|
| + const BoundNetLog& net_log) override;
|
| virtual int ResolveFromCache(const RequestInfo& info,
|
| AddressList* addresses,
|
| - const BoundNetLog& net_log) OVERRIDE;
|
| - virtual void CancelRequest(RequestHandle req) OVERRIDE {}
|
| + const BoundNetLog& net_log) override;
|
| + virtual void CancelRequest(RequestHandle req) override {}
|
| };
|
|
|
| // This class sets the default HostResolverProc for a particular scope. The
|
|
|