| Index: net/dns/host_resolver_impl_unittest.cc
|
| diff --git a/net/dns/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc
|
| index 89112de718012afa962b9fd54b8ff0b35103fcee..dadc03dc7eec8c90f3de0b155706564094dd2916 100644
|
| --- a/net/dns/host_resolver_impl_unittest.cc
|
| +++ b/net/dns/host_resolver_impl_unittest.cc
|
| @@ -129,7 +129,7 @@ class MockHostResolverProc : public HostResolverProc {
|
| AddressFamily address_family,
|
| HostResolverFlags host_resolver_flags,
|
| AddressList* addrlist,
|
| - int* os_error) OVERRIDE {
|
| + int* os_error) override {
|
| base::AutoLock lock(lock_);
|
| capture_list_.push_back(ResolveKey(hostname, address_family));
|
| ++num_requests_waiting_;
|
| @@ -365,7 +365,7 @@ class LookupAttemptHostResolverProc : public HostResolverProc {
|
| AddressFamily address_family,
|
| HostResolverFlags host_resolver_flags,
|
| AddressList* addrlist,
|
| - int* os_error) OVERRIDE {
|
| + int* os_error) override {
|
| bool wait_for_right_attempt_to_complete = true;
|
| {
|
| base::AutoLock auto_lock(lock_);
|
| @@ -460,11 +460,11 @@ class HostResolverImplTest : public testing::Test {
|
| };
|
|
|
| // testing::Test implementation:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| CreateResolver();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| if (resolver_.get())
|
| EXPECT_EQ(0u, resolver_->num_running_dispatcher_jobs_for_tests());
|
| EXPECT_FALSE(proc_->HasBlockedRequests());
|
| @@ -732,7 +732,7 @@ TEST_F(HostResolverImplTest, CanceledRequestsReleaseJobSlots) {
|
|
|
| TEST_F(HostResolverImplTest, CancelWithinCallback) {
|
| struct MyHandler : public Handler {
|
| - virtual void Handle(Request* req) OVERRIDE {
|
| + virtual void Handle(Request* req) override {
|
| // Port 80 is the first request that the callback will be invoked for.
|
| // While we are executing within that callback, cancel the other requests
|
| // in the job and start another request.
|
| @@ -761,7 +761,7 @@ TEST_F(HostResolverImplTest, CancelWithinCallback) {
|
|
|
| TEST_F(HostResolverImplTest, DeleteWithinCallback) {
|
| struct MyHandler : public Handler {
|
| - virtual void Handle(Request* req) OVERRIDE {
|
| + virtual void Handle(Request* req) override {
|
| EXPECT_EQ("a", req->info().hostname());
|
| EXPECT_EQ(80, req->info().port());
|
|
|
| @@ -787,7 +787,7 @@ TEST_F(HostResolverImplTest, DeleteWithinCallback) {
|
|
|
| TEST_F(HostResolverImplTest, DeleteWithinAbortedCallback) {
|
| struct MyHandler : public Handler {
|
| - virtual void Handle(Request* req) OVERRIDE {
|
| + virtual void Handle(Request* req) override {
|
| EXPECT_EQ("a", req->info().hostname());
|
| EXPECT_EQ(80, req->info().port());
|
|
|
| @@ -827,7 +827,7 @@ TEST_F(HostResolverImplTest, DeleteWithinAbortedCallback) {
|
|
|
| TEST_F(HostResolverImplTest, StartWithinCallback) {
|
| struct MyHandler : public Handler {
|
| - virtual void Handle(Request* req) OVERRIDE {
|
| + virtual void Handle(Request* req) override {
|
| if (req->index() == 0) {
|
| // On completing the first request, start another request for "a".
|
| // Since caching is disabled, this will result in another async request.
|
| @@ -858,7 +858,7 @@ TEST_F(HostResolverImplTest, StartWithinCallback) {
|
|
|
| TEST_F(HostResolverImplTest, BypassCache) {
|
| struct MyHandler : public Handler {
|
| - virtual void Handle(Request* req) OVERRIDE {
|
| + virtual void Handle(Request* req) override {
|
| if (req->index() == 0) {
|
| // On completing the first request, start another request for "a".
|
| // Since caching is enabled, this should complete synchronously.
|
| @@ -956,7 +956,7 @@ TEST_F(HostResolverImplTest, ObeyPoolConstraintsAfterIPAddressChange) {
|
| // will not be aborted.
|
| TEST_F(HostResolverImplTest, AbortOnlyExistingRequestsOnIPAddressChange) {
|
| struct MyHandler : public Handler {
|
| - virtual void Handle(Request* req) OVERRIDE {
|
| + virtual void Handle(Request* req) override {
|
| // Start new request for a different hostname to ensure that the order
|
| // of jobs in HostResolverImpl is not stable.
|
| std::string hostname;
|
| @@ -1339,7 +1339,7 @@ class HostResolverImplDnsTest : public HostResolverImplTest {
|
|
|
| protected:
|
| // testing::Test implementation:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| AddDnsRule("nx", dns_protocol::kTypeA, MockDnsClientRule::FAIL, false);
|
| AddDnsRule("nx", dns_protocol::kTypeAAAA, MockDnsClientRule::FAIL, false);
|
| AddDnsRule("ok", dns_protocol::kTypeA, MockDnsClientRule::OK, false);
|
| @@ -1381,7 +1381,7 @@ class HostResolverImplDnsTest : public HostResolverImplTest {
|
| // HostResolverImplTest implementation:
|
| virtual void CreateResolverWithLimitsAndParams(
|
| size_t max_concurrent_resolves,
|
| - const HostResolverImpl::ProcTaskParams& params) OVERRIDE {
|
| + const HostResolverImpl::ProcTaskParams& params) override {
|
| HostResolverImpl::Options options = DefaultOptions();
|
| options.max_concurrent_resolves = max_concurrent_resolves;
|
| resolver_.reset(new HostResolverImpl(options, NULL));
|
|
|