Skip to content

GitLab

T
tangled
Commit d86c8719 authored by Anna Malova's avatar Anna Malova Committed by Commit Bot
Browse files
Options

Convert MDnsTransaction ResultCallback to RepeatingCallback 

Bug: 1007815
Change-Id: Ib823528514afe8743c6af5a055a8c7923e90ef95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089697Reviewed-by: default avatarEric Orth <ericorth@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747979}
parent f2eca9b2
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 44 deletions
chrome/browser/local_discovery/service_discovery_client_impl.cc
View file @ d86c8719
......@@ -113,8 +113,8 @@ bool ServiceWatcherImpl::CreateTransaction(
if (transaction_flags) {
*transaction = mdns_client_->CreateTransaction(
net::dns_protocol::kTypePTR, service_type_, transaction_flags,
base::Bind(&ServiceWatcherImpl::OnTransactionResponse,
AsWeakPtr(), transaction));
base::BindRepeating(&ServiceWatcherImpl::OnTransactionResponse,
AsWeakPtr(), transaction));
return (*transaction)->Start();
}
......@@ -213,9 +213,10 @@ 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,
base::Unretained(this)));
net::MDnsTransaction::QUERY_CACHE |
net::MDnsTransaction::QUERY_NETWORK,
base::BindRepeating(&ServiceWatcherImpl::ServiceListeners::OnSRVRecord,
base::Unretained(this)));
srv_transaction_->Start();
} else if (!active_refresh) {
srv_transaction_.reset();
......@@ -352,20 +353,19 @@ bool ServiceResolverImpl::CreateTxtTransaction() {
txt_transaction_ = mdns_client_->CreateTransaction(
net::dns_protocol::kTypeTXT, service_name_,
net::MDnsTransaction::SINGLE_RESULT | net::MDnsTransaction::QUERY_CACHE |
net::MDnsTransaction::QUERY_NETWORK,
base::Bind(&ServiceResolverImpl::TxtRecordTransactionResponse,
AsWeakPtr()));
net::MDnsTransaction::QUERY_NETWORK,
base::BindRepeating(&ServiceResolverImpl::TxtRecordTransactionResponse,
AsWeakPtr()));
return txt_transaction_->Start();
}
// 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,
AsWeakPtr()));
base::BindRepeating(&ServiceResolverImpl::ARecordTransactionResponse,
AsWeakPtr()));
a_transaction_->Start();
}
......@@ -373,9 +373,9 @@ bool ServiceResolverImpl::CreateSrvTransaction() {
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(&ServiceResolverImpl::SrvRecordTransactionResponse,
AsWeakPtr()));
net::MDnsTransaction::QUERY_NETWORK,
base::BindRepeating(&ServiceResolverImpl::SrvRecordTransactionResponse,
AsWeakPtr()));
return srv_transaction_->Start();
}
......@@ -512,11 +512,11 @@ 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 |
net::MDnsTransaction::QUERY_NETWORK,
base::Bind(&LocalDomainResolverImpl::OnTransactionComplete,
base::Unretained(this)));
type, domain_,
net::MDnsTransaction::SINGLE_RESULT | net::MDnsTransaction::QUERY_CACHE |
net::MDnsTransaction::QUERY_NETWORK,
base::BindRepeating(&LocalDomainResolverImpl::OnTransactionComplete,
base::Unretained(this)));
}
void LocalDomainResolverImpl::OnTransactionComplete(
......
net/dns/mdns_client.h
View file @ d86c8719
......@@ -70,8 +70,8 @@ class NET_EXPORT MDnsTransaction {
FLAG_MASK = (1 << 3) - 1,
};
typedef base::Callback<void(Result, const RecordParsed*)>
ResultCallback;
typedef base::RepeatingCallback<void(Result, const RecordParsed*)>
ResultCallback;
// Destroying the transaction cancels it.
virtual ~MDnsTransaction() {}
......
net/dns/mdns_client_unittest.cc
View file @ d86c8719
......@@ -691,8 +691,8 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) {
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_privet->Start());
......@@ -714,8 +714,8 @@ TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
test_client_->CreateTransaction(
dns_protocol::kTypePTR, "_privet._tcp.local",
MDnsTransaction::QUERY_CACHE | MDnsTransaction::SINGLE_RESULT,
base::Bind(&MDnsTest::MockableRecordCallback,
base::Unretained(this)));
base::BindRepeating(&MDnsTest::MockableRecordCallback,
base::Unretained(this)));
EXPECT_CALL(*this,
MockableRecordCallback(MDnsTransaction::RESULT_NO_RESULTS, _))
......@@ -748,8 +748,8 @@ TEST_F(MDnsTest, TransactionWithCache) {
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_privet->Start());
......@@ -788,8 +788,8 @@ TEST_F(MDnsTest, TransactionTimeout) {
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_privet->Start());
......@@ -808,8 +808,8 @@ TEST_F(MDnsTest, TransactionMultipleRecords) {
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)));
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,15 +894,15 @@ TEST_F(MDnsTest, TransactionReentrantCacheLookupStart) {
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)));
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::Unretained(this)));
base::BindRepeating(&MDnsTest::MockableRecordCallback2,
base::Unretained(this)));
EXPECT_CALL(*this, MockableRecordCallback2(MDnsTransaction::RESULT_RECORD,
_))
......@@ -1028,8 +1030,8 @@ TEST_F(MDnsTest, NsecWithTransactionFromNetwork) {
dns_protocol::kTypeA, "_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)));
EXPECT_CALL(socket_factory_, OnSendTo(_)).Times(2);
......@@ -1061,8 +1063,8 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) {
dns_protocol::kTypeA, "_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_privet_a->Start());
......@@ -1074,8 +1076,8 @@ TEST_F(MDnsTest, NsecWithTransactionFromCache) {
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)));
EXPECT_CALL(socket_factory_, OnSendTo(_)).Times(2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment