Convert base::Bind and friends in net/dns.

Bug: 1007815
Change-Id: Idfa01b46b4ada3e968843277124841e70932bc7d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285512
Commit-Queue: Eric Roman <eroman@chromium.org>
Auto-Submit: Steve Kobes <skobes@chromium.org>
Reviewed-by: Eric Roman <eroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786441}

net/dns/dns_session_unittest.cc

@@ -109,7 +109,8 @@ class DnsSessionTest : public TestWithTaskEnvironment {
 class MockDnsSocketPool : public DnsSocketPool {
  public:
   MockDnsSocketPool(ClientSocketFactory* factory, DnsSessionTest* test)
-      : DnsSocketPool(factory, base::Bind(&base::RandInt)), test_(test) {}
+      : DnsSocketPool(factory, base::BindRepeating(&base::RandInt)),
+        test_(test) {}
 
   ~MockDnsSocketPool() override = default;
 
@@ -150,7 +151,7 @@ void DnsSessionTest::Initialize(size_t num_servers) {
 
   session_ =
       new DnsSession(config_, std::unique_ptr<DnsSocketPool>(dns_socket_pool),
-                     base::Bind(&base::RandInt), nullptr /* NetLog */);
+                     base::BindRepeating(&base::RandInt), nullptr /* NetLog */);
 
   events_.clear();
 }

net/dns/dns_socket_pool_unittest.cc

@@ -33,7 +33,8 @@ class DummyRandIntCallback {
   DummyRandIntCallback() = default;
 
   RandIntCallback MakeCallback() {
-    return base::Bind(&DummyRandIntCallback::GetRandInt, dummy_.GetWeakPtr());
+    return base::BindRepeating(&DummyRandIntCallback::GetRandInt,
+                               dummy_.GetWeakPtr());
   }
 
   bool HasRefs() const { return dummy_.HasWeakPtrs(); }

net/dns/dns_transaction_unittest.cc

@@ -621,8 +621,9 @@ class DnsTransactionTestBase : public testing::Test {
     session_ = new DnsSession(
         config_,
         DnsSocketPool::CreateNull(socket_factory_.get(),
-                                  base::Bind(base::RandInt)),
-        base::Bind(&DnsTransactionTestBase::GetNextId, base::Unretained(this)),
+                                  base::BindRepeating(base::RandInt)),
+        base::BindRepeating(&DnsTransactionTestBase::GetNextId,
+                            base::Unretained(this)),
         nullptr /* NetLog */);
     resolve_context_->InvalidateCachesAndPerSessionData(
         session_.get(), false /* network_change */);

net/dns/mdns_client_impl.cc

@@ -574,8 +574,8 @@ void MDnsListenerImpl::ScheduleNextRefresh() {
     return;
   }
 
-  next_refresh_.Reset(base::Bind(&MDnsListenerImpl::DoRefresh,
-                                 AsWeakPtr()));
+  next_refresh_.Reset(
+      base::BindRepeating(&MDnsListenerImpl::DoRefresh, AsWeakPtr()));
 
   // Schedule refreshes at both 85% and 95% of the original TTL. These will both
   // be canceled and rescheduled if the record's TTL is updated due to a
@@ -731,8 +731,8 @@ bool MDnsTransactionImpl::QueryAndListen() {
   if (!client_->core()->SendQuery(rrtype_, name_))
     return false;
 
-  timeout_.Reset(base::Bind(&MDnsTransactionImpl::SignalTransactionOver,
-                            AsWeakPtr()));
+  timeout_.Reset(
+      base::BindOnce(&MDnsTransactionImpl::SignalTransactionOver, AsWeakPtr()));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, timeout_.callback(), kTransactionTimeout);
 

net/dns/mdns_client_impl.h

@@ -328,7 +328,7 @@ class MDnsTransactionImpl : public base::SupportsWeakPtr<MDnsTransactionImpl>,
   MDnsTransaction::ResultCallback callback_;
 
   std::unique_ptr<MDnsListener> listener_;
-  base::CancelableCallback<void()> timeout_;
+  base::CancelableOnceCallback<void()> timeout_;
 
   MDnsClientImpl* client_;
 

net/dns/mdns_client_unittest.cc

@@ -469,8 +469,8 @@ void MDnsTest::DeleteBothListeners() {
 }
 
 void MDnsTest::RunFor(base::TimeDelta time_period) {
-  base::CancelableCallback<void()> callback(base::Bind(&MDnsTest::Stop,
-                                                       base::Unretained(this)));
+  base::CancelableOnceCallback<void()> callback(
+      base::BindOnce(&MDnsTest::Stop, base::Unretained(this)));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, callback.callback(), time_period);