Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: chrome/browser/local_discovery/service_discovery_client_impl.cc

Issue 2963613002: Remove the (broken and unneeded) 'force_update' option from ServiceWatcher::DiscoverNewDevices. (Closed)
Patch Set: Fixup yet another mac site revealed by CQ Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/local_discovery/service_discovery_client_impl.cc
diff --git a/chrome/browser/local_discovery/service_discovery_client_impl.cc b/chrome/browser/local_discovery/service_discovery_client_impl.cc
index 9b07f255acadeb41ef9571e32dd8baebf439a5e0..b6ae3a16951728c22bfa3dc28f068d506d323754 100644
--- a/chrome/browser/local_discovery/service_discovery_client_impl.cc
+++ b/chrome/browser/local_discovery/service_discovery_client_impl.cc
@@ -78,11 +78,9 @@ void ServiceWatcherImpl::Start() {
ServiceWatcherImpl::~ServiceWatcherImpl() {
}
-void ServiceWatcherImpl::DiscoverNewServices(bool force_update) {
+void ServiceWatcherImpl::DiscoverNewServices() {
DCHECK(started_);
- if (force_update)
- services_.clear();
- SendQuery(kInitialRequeryTimeSeconds, force_update);
+ SendQuery(kInitialRequeryTimeSeconds);
}
void ServiceWatcherImpl::SetActivelyRefreshServices(
@@ -96,14 +94,12 @@ void ServiceWatcherImpl::SetActivelyRefreshServices(
void ServiceWatcherImpl::ReadCachedServices() {
DCHECK(started_);
- CreateTransaction(false /*network*/, true /*cache*/, false /*force refresh*/,
- &transaction_cache_);
+ CreateTransaction(false /*network*/, true /*cache*/, &transaction_cache_);
}
bool ServiceWatcherImpl::CreateTransaction(
bool network,
bool cache,
- bool force_refresh,
std::unique_ptr<net::MDnsTransaction>* transaction) {
int transaction_flags = 0;
if (network)
@@ -112,7 +108,6 @@ bool ServiceWatcherImpl::CreateTransaction(
if (cache)
transaction_flags |= net::MDnsTransaction::QUERY_CACHE;
- // TODO(noamsml): Add flag for force_refresh when supported.
if (transaction_flags) {
*transaction = mdns_client_->CreateTransaction(
net::dns_protocol::kTypePTR, service_type_, transaction_flags,
@@ -318,16 +313,13 @@ void ServiceWatcherImpl::ScheduleQuery(int timeout_seconds) {
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&ServiceWatcherImpl::SendQuery, AsWeakPtr(),
- timeout_seconds * 2 /*next_timeout_seconds*/,
- false /*force_update*/),
+ timeout_seconds * 2 /*next_timeout_seconds*/),
base::TimeDelta::FromSeconds(timeout_seconds));
}
}
-void ServiceWatcherImpl::SendQuery(int next_timeout_seconds,
- bool force_update) {
- CreateTransaction(true /*network*/, false /*cache*/, force_update,
- &transaction_network_);
+void ServiceWatcherImpl::SendQuery(int next_timeout_seconds) {
+ CreateTransaction(true /*network*/, false /*cache*/, &transaction_network_);
ScheduleQuery(next_timeout_seconds);
}

Powered by Google App Engine
This is Rietveld 408576698