Convert MDnsTransaction ResultCallback to RepeatingCallback

Bug: 1007815
Change-Id: Ib823528514afe8743c6af5a055a8c7923e90ef95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089697Reviewed-by: Eric Orth <ericorth@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747979}

chrome/browser/local_discovery/service_discovery_client_impl.cc

@@ -113,7 +113,7 @@ bool ServiceWatcherImpl::CreateTransaction(
   if (transaction_flags) {
     *transaction = mdns_client_->CreateTransaction(
         net::dns_protocol::kTypePTR, service_type_, transaction_flags,
-        base::Bind(&ServiceWatcherImpl::OnTransactionResponse,
+        base::BindRepeating(&ServiceWatcherImpl::OnTransactionResponse,
                             AsWeakPtr(), transaction));
     return (*transaction)->Start();
   }
@@ -213,8 +213,9 @@ void ServiceWatcherImpl::ServiceListeners::SetActiveRefresh(
     srv_transaction_ = mdns_client_->CreateTransaction(
         net::dns_protocol::kTypeSRV, service_name_,
         net::MDnsTransaction::SINGLE_RESULT |
-        net::MDnsTransaction::QUERY_CACHE | net::MDnsTransaction::QUERY_NETWORK,
-        base::Bind(&ServiceWatcherImpl::ServiceListeners::OnSRVRecord,
+            net::MDnsTransaction::QUERY_CACHE |
+            net::MDnsTransaction::QUERY_NETWORK,
+        base::BindRepeating(&ServiceWatcherImpl::ServiceListeners::OnSRVRecord,
                             base::Unretained(this)));
     srv_transaction_->Start();
   } else if (!active_refresh) {
@@ -353,7 +354,7 @@ bool ServiceResolverImpl::CreateTxtTransaction() {
       net::dns_protocol::kTypeTXT, service_name_,
       net::MDnsTransaction::SINGLE_RESULT | net::MDnsTransaction::QUERY_CACHE |
           net::MDnsTransaction::QUERY_NETWORK,
-      base::Bind(&ServiceResolverImpl::TxtRecordTransactionResponse,
+      base::BindRepeating(&ServiceResolverImpl::TxtRecordTransactionResponse,
                           AsWeakPtr()));
   return txt_transaction_->Start();
 }
@@ -361,10 +362,9 @@ bool ServiceResolverImpl::CreateTxtTransaction() {
 // TODO(noamsml): quick-resolve for AAAA records.  Since A records tend to be in
 void ServiceResolverImpl::CreateATransaction() {
   a_transaction_ = mdns_client_->CreateTransaction(
-      net::dns_protocol::kTypeA,
-      service_staging_.address.host(),
+      net::dns_protocol::kTypeA, service_staging_.address.host(),
       net::MDnsTransaction::SINGLE_RESULT | net::MDnsTransaction::QUERY_CACHE,
-      base::Bind(&ServiceResolverImpl::ARecordTransactionResponse,
+      base::BindRepeating(&ServiceResolverImpl::ARecordTransactionResponse,
                           AsWeakPtr()));
   a_transaction_->Start();
 }
@@ -374,7 +374,7 @@ bool ServiceResolverImpl::CreateSrvTransaction() {
       net::dns_protocol::kTypeSRV, service_name_,
       net::MDnsTransaction::SINGLE_RESULT | net::MDnsTransaction::QUERY_CACHE |
           net::MDnsTransaction::QUERY_NETWORK,
-      base::Bind(&ServiceResolverImpl::SrvRecordTransactionResponse,
+      base::BindRepeating(&ServiceResolverImpl::SrvRecordTransactionResponse,
                           AsWeakPtr()));
   return srv_transaction_->Start();
 }
@@ -512,10 +512,10 @@ void LocalDomainResolverImpl::Start() {
 std::unique_ptr<net::MDnsTransaction>
 LocalDomainResolverImpl::CreateTransaction(uint16_t type) {
   return mdns_client_->CreateTransaction(
-      type, domain_, net::MDnsTransaction::SINGLE_RESULT |
-                     net::MDnsTransaction::QUERY_CACHE |
+      type, domain_,
+      net::MDnsTransaction::SINGLE_RESULT | net::MDnsTransaction::QUERY_CACHE |
           net::MDnsTransaction::QUERY_NETWORK,
-      base::Bind(&LocalDomainResolverImpl::OnTransactionComplete,
+      base::BindRepeating(&LocalDomainResolverImpl::OnTransactionComplete,
                           base::Unretained(this)));
 }
 

net/dns/mdns_client.h

@@ -70,7 +70,7 @@ class NET_EXPORT MDnsTransaction {
     FLAG_MASK = (1 << 3) - 1,
   };
 
-  typedef base::Callback<void(Result, const RecordParsed*)>
+  typedef base::RepeatingCallback<void(Result, const RecordParsed*)>
       ResultCallback;
 
   // Destroying the transaction cancels it.

net/dns/mdns_client_unittest.cc

@@ -691,7 +691,7 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) {
           dns_protocol::kTypePTR, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
               MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   ASSERT_TRUE(transaction_privet->Start());
@@ -714,7 +714,7 @@ TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
       test_client_->CreateTransaction(
           dns_protocol::kTypePTR, "_privet._tcp.local",
           MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   EXPECT_CALL(*this,
@@ -748,7 +748,7 @@ TEST_F(MDnsTest, TransactionWithCache) {
           dns_protocol::kTypePTR, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
               MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   ASSERT_TRUE(transaction_privet->Start());
@@ -788,7 +788,7 @@ TEST_F(MDnsTest, TransactionTimeout) {
           dns_protocol::kTypePTR, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
               MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   ASSERT_TRUE(transaction_privet->Start());
@@ -808,7 +808,7 @@ TEST_F(MDnsTest, TransactionMultipleRecords) {
       test_client_->CreateTransaction(
           dns_protocol::kTypePTR, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   ASSERT_TRUE(transaction_privet->Start());
@@ -845,7 +845,8 @@ TEST_F(MDnsTest, TransactionReentrantDelete) {
       dns_protocol::kTypePTR, "_privet._tcp.local",
       MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
           MDnsTransaction::SINGLE_RESULT,
-      base::Bind(&MDnsTest::MockableRecordCallback, base::Unretained(this)));
+      base::BindRepeating(&MDnsTest::MockableRecordCallback,
+                          base::Unretained(this)));
 
   ASSERT_TRUE(transaction_->Start());
 
@@ -873,7 +874,8 @@ TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) {
   transaction_ = test_client_->CreateTransaction(
       dns_protocol::kTypePTR, "_privet._tcp.local",
       MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE,
-      base::Bind(&MDnsTest::MockableRecordCallback, base::Unretained(this)));
+      base::BindRepeating(&MDnsTest::MockableRecordCallback,
+                          base::Unretained(this)));
 
   EXPECT_CALL(*this, MockableRecordCallback(MDnsTransaction::RESULT_RECORD, _))
       .Times(Exactly(1))
@@ -892,14 +894,14 @@ TEST_F(MDnsTest, TransactionReentrantCacheLookupStart) {
           dns_protocol::kTypePTR, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
               MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   std::unique_ptr<MDnsTransaction> transaction2 =
       test_client_->CreateTransaction(
           dns_protocol::kTypePTR, "_printer._tcp.local",
           MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback2,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback2,
                               base::Unretained(this)));
 
   EXPECT_CALL(*this, MockableRecordCallback2(MDnsTransaction::RESULT_RECORD,
@@ -1028,7 +1030,7 @@ TEST_F(MDnsTest, NsecWithTransactionFromNetwork) {
           dns_protocol::kTypeA, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
               MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   EXPECT_CALL(socket_factory_, OnSendTo(_)).Times(2);
@@ -1061,7 +1063,7 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) {
           dns_protocol::kTypeA, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
               MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   ASSERT_TRUE(transaction_privet_a->Start());
@@ -1074,7 +1076,7 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) {
           dns_protocol::kTypePTR, "_privet._tcp.local",
           MDnsTransaction::QUERY_NETWORK | MDnsTransaction::QUERY_CACHE |
               MDnsTransaction::SINGLE_RESULT,
-          base::Bind(&MDnsTest::MockableRecordCallback,
+          base::BindRepeating(&MDnsTest::MockableRecordCallback,
                               base::Unretained(this)));
 
   EXPECT_CALL(socket_factory_, OnSendTo(_)).Times(2);