Display DNS probe results.

chrome/browser/net/dns_probe_service.cc

Index: chrome/browser/net/dns_probe_service.cc
diff --git a/chrome/browser/net/dns_probe_service.cc b/chrome/browser/net/dns_probe_service.cc
index 8a0e9f073e973e6581e7c11a1924c5d5760cf34c..d557572a03bcb018a013a270b0d5b78137c72ada 100644
--- a/chrome/browser/net/dns_probe_service.cc
+++ b/chrome/browser/net/dns_probe_service.cc
@@ -7,17 +7,18 @@
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
-#include "chrome/browser/net/dns_probe_job.h"
+#include "chrome/browser/net/dns_probe_runner.h"

[mmenke, 2013/06/11 16:15:35]

nit:  Already used in header.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

 #include "chrome/common/net/net_error_info.h"

[mmenke, 2013/06/11 16:15:35]

nit:  Already used in header.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
+#include "net/base/network_change_notifier.h"

[mmenke, 2013/06/11 16:15:35]

nit:  Already used in header.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config_service.h"
 #include "net/dns/dns_protocol.h"
 
 using base::FieldTrialList;
 using base::StringToInt;
-using chrome_common_net::DnsProbeResult;
+using chrome_common_net::DnsProbeStatus;
 using net::DnsClient;
 using net::DnsConfig;
 using net::IPAddressNumber;
@@ -25,8 +26,6 @@ using net::IPEndPoint;
 using net::ParseIPLiteralToNumber;
 using net::NetworkChangeNotifier;
 
-namespace chrome_browser_net {
-
 namespace {
 
 // How long the DnsProbeService will cache the probe result for.
@@ -36,8 +35,8 @@ const int kMaxResultAgeMs = 5000;
 
 // The public DNS servers used by the DnsProbeService to verify internet
 // connectivity.
-const char kPublicDnsPrimary[]   = "8.8.8.8";
-const char kPublicDnsSecondary[] = "8.8.4.4";
+const char kGooglePublicDns1[]   = "8.8.8.8";

[mmenke, 2013/06/12 19:17:12]

nit:  Remove extra spaces.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

+const char kGooglePublicDns2[] = "8.8.4.4";
 
 IPEndPoint MakeDnsEndPoint(const std::string& dns_ip_literal) {
   IPAddressNumber dns_ip_number;
@@ -62,34 +61,26 @@ int GetAttemptsFromFieldTrial() {
   return attempts;
 }

[mmenke, 2013/06/11 16:15:35]

This function is not currently being used, nor is this being used elsewhere. 
Did we ever decide what to do here?

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Nah, we didn't decide.  I'll remove it, and we can take a look at the data
lazily and alter the default (1) if it turns out it was bad.

 
-bool IsLocalhost(const IPAddressNumber& ip) {
-  return (ip.size() == net::kIPv4AddressSize)
-         && (ip[0] == 127) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 1);
-}
-
-// The maximum number of nameservers counted in histograms.
-const int kNameserverCountMax = 10;
-
 }  // namespace
 
+namespace chrome_browser_net {
+
 DnsProbeService::DnsProbeService()
-    : system_result_(DnsProbeJob::SERVERS_UNKNOWN),
-      public_result_(DnsProbeJob::SERVERS_UNKNOWN),
-      state_(STATE_NO_RESULTS),
-      result_(chrome_common_net::DNS_PROBE_UNKNOWN),
-      dns_attempts_(GetAttemptsFromFieldTrial()) {
-  NetworkChangeNotifier::AddIPAddressObserver(this);
+    : state_(STATE_NO_RESULTS) {
+  NetworkChangeNotifier::AddDNSObserver(this);
+  SetSystemClientToCurrentConfig();
+  SetPublicClientToGooglePublicDns();
 }
 
 DnsProbeService::~DnsProbeService() {
-  NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  NetworkChangeNotifier::RemoveDNSObserver(this);
 }
 
-void DnsProbeService::ProbeDns(const DnsProbeService::CallbackType& callback) {
-  callbacks_.push_back(callback);
+void DnsProbeService::ProbeDns(const DnsProbeService::ProbeCallback& callback) {
+  pending_callbacks_.push_back(callback);
 
   if (state_ == STATE_RESULTS_CACHED && ResultsExpired())
-    ExpireResults();
+    ExpireResult();
 
   switch (state_) {
   case STATE_NO_RESULTS:
@@ -104,68 +95,91 @@ void DnsProbeService::ProbeDns(const DnsProbeService::CallbackType& callback) {
   }
 }
 
-scoped_ptr<DnsProbeJob> DnsProbeService::CreateSystemProbeJob(
-    const DnsProbeJob::CallbackType& job_callback) {
+void DnsProbeService::OnDNSChanged() {
+  ExpireResult();
+  SetSystemClientToCurrentConfig();
+}
+
+void DnsProbeService::SetSystemClientForTesting(
+    scoped_ptr<DnsClient> system_client) {
+  SetSystemClient(system_client.Pass());
+}
+
+void DnsProbeService::SetPublicClientForTesting(
+    scoped_ptr<DnsClient> public_client) {
+  SetPublicClient(public_client.Pass());
+}
+
+void DnsProbeService::ExpireResultForTesting() {
+  ExpireResult();
+}
+
+void DnsProbeService::SetSystemClientToCurrentConfig() {
   DnsConfig system_config;
-  GetSystemDnsConfig(&system_config);
-  return CreateProbeJob(system_config, job_callback);
+  NetworkChangeNotifier::GetDnsConfig(&system_config);
+  system_config.search.clear();
+  system_config.attempts = 1;
+  system_config.randomize_ports = false;

[mmenke, 2013/06/11 16:15:35]

Think these two behaviors are worth mentioning in the header somewhere.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

+
+  scoped_ptr<DnsClient> system_client(DnsClient::CreateClient(NULL));
+  system_client->SetConfig(system_config);
+
+  SetSystemClient(system_client.Pass());
 }
 
-scoped_ptr<DnsProbeJob> DnsProbeService::CreatePublicProbeJob(
-    const DnsProbeJob::CallbackType& job_callback) {
+void DnsProbeService::SetPublicClientToGooglePublicDns() {
   DnsConfig public_config;
-  GetPublicDnsConfig(&public_config);
-  return CreateProbeJob(public_config, job_callback);
-}
+  public_config.nameservers.push_back(MakeDnsEndPoint(kGooglePublicDns1));
+  public_config.nameservers.push_back(MakeDnsEndPoint(kGooglePublicDns1));

[mmenke, 2013/06/11 16:15:35]

kGooglePublicDns1 -> kGooglePublicDns2

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

+  public_config.attempts = 1;
+  public_config.randomize_ports = false;
 
-void DnsProbeService::OnIPAddressChanged() {
-  if (state_ == STATE_RESULTS_CACHED)
-    ExpireResults();
+  scoped_ptr<DnsClient> public_client(DnsClient::CreateClient(NULL));
+  public_client->SetConfig(public_config);
+
+  SetPublicClient(public_client.Pass());
 }
 
-void DnsProbeService::ExpireResults() {
-  DCHECK_EQ(STATE_RESULTS_CACHED, state_);
+void DnsProbeService::SetSystemClient(scoped_ptr<DnsClient> system_client) {
+  system_runner_.set_client(system_client.Pass());
+}
 
-  state_ = STATE_NO_RESULTS;
-  result_ = chrome_common_net::DNS_PROBE_UNKNOWN;
+void DnsProbeService::SetPublicClient(scoped_ptr<DnsClient> public_client) {
+  public_runner_.set_client(public_client.Pass());
 }
 
 void DnsProbeService::StartProbes() {
   DCHECK_NE(STATE_PROBE_RUNNING, state_);

[mmenke, 2013/06/11 16:15:35]

Think you can DCHECK_EQ(STATE_NO_RESULTS, state_); here.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

-  DCHECK(!system_job_.get());
-  DCHECK(!public_job_.get());
-
-  DnsProbeJob::CallbackType job_callback =
-      base::Bind(&DnsProbeService::OnProbeJobComplete,
-                 base::Unretained(this));
-
-  // TODO(ttuttle): Do we want to keep explicit flags for "job done"?
-  //                Or maybe DnsProbeJob should have a "finished" flag?
-  system_result_ = DnsProbeJob::SERVERS_UNKNOWN;
-  public_result_ = DnsProbeJob::SERVERS_UNKNOWN;
-
-  system_job_ = CreateSystemProbeJob(job_callback);
-  public_job_ = CreatePublicProbeJob(job_callback);
-
-  // If we can't create one or both jobs, fail the probe immediately.
-  if (!system_job_.get() || !public_job_.get()) {
-    system_job_.reset();
-    public_job_.reset();
-    state_ = STATE_RESULTS_CACHED;
-    // TODO(ttuttle): Should this be BAD_CONFIG?  Currently I think it only
-    // happens when the system DnsConfig has no servers.
-    result_ = chrome_common_net::DNS_PROBE_UNKNOWN;
-    CallCallbacks();
-    return;
-  }
 
   state_ = STATE_PROBE_RUNNING;
   probe_start_time_ = base::Time::Now();
+
+  const base::Callback<void(ProbeType, DnsProbeRunner::Result)> callback =
+      base::Bind(&DnsProbeService::OnProbeComplete, base::Unretained(this));
+  system_runner_.RunProbe(base::Bind(callback, SYSTEM));
+  public_runner_.RunProbe(base::Bind(callback, PUBLIC));

[mmenke, 2013/06/11 16:15:35]

Suggest a comment that it's theoretically possible for the probe to have
finished by the time we're here.  Easy to overlook the (rare) sync case.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Done.

 }
 
-void DnsProbeService::OnProbesComplete() {
+void DnsProbeService::OnProbeComplete(
+    ProbeType type,
+    DnsProbeRunner::Result result) {
   DCHECK_EQ(STATE_PROBE_RUNNING, state_);
 
+  switch (type) {
+  case SYSTEM:

[mmenke, 2013/06/11 16:15:35]

DCHECK(system_runner_.is_running())?

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

No; that returns false during the callback.

[mmenke, 2013/06/13 15:00:12]

DCHECK(!system_runner_.is_running())?  :)

+    system_result_ = result;
+    break;
+  case PUBLIC:

[mmenke, 2013/06/11 16:15:35]

DCHECK(public_runner_.is_running());

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Ditto.

[mmenke, 2013/06/13 15:00:12]

DCHECK(!public_runner_.is_running())?  :)

+    public_result_ = result;
+    break;
+  default:
+    NOTREACHED();
+    return;
+  }
+
+  if (system_runner_.is_running() || public_runner_.is_running())
+    return;
+
   state_ = STATE_RESULTS_CACHED;
   result_ = EvaluateResults();
 
@@ -174,171 +188,109 @@ void DnsProbeService::OnProbesComplete() {
   CallCallbacks();
 }
 
+DnsProbeStatus DnsProbeService::EvaluateResults() const {
+  DCHECK_NE(DnsProbeRunner::UNKNOWN, system_result_);
+  DCHECK_NE(DnsProbeRunner::UNKNOWN, public_result_);
+
+  // If the system DNS is working, assume the domain doesn't exist.
+  if (system_result_ == DnsProbeRunner::CORRECT)
+    return chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN;
+
+  // If the system DNS is not working but another public server is, assume the
+  // DNS config is bad (or perhaps the DNS servers are down or broken).
+  if (public_result_ == DnsProbeRunner::CORRECT)
+    return chrome_common_net::DNS_PROBE_FINISHED_BAD_CONFIG;
+
+  // If the system DNS is not working and another public server is unreachable,
+  // assume the internet connection is down (note that system DNS may be a
+  // router on the LAN, so it may be reachable but returning errors.)
+  if (public_result_ == DnsProbeRunner::UNREACHABLE)
+    return chrome_common_net::DNS_PROBE_FINISHED_NO_INTERNET;
+
+  // Otherwise: the system DNS is not working and another public server is
+  // responding but with errors or incorrect results.  This is an awkward case;
+  // an invasive captive portal or a restrictive firewall may be intercepting
+  // or rewriting DNS traffic, or the public server may itself be failing or
+  // down.
+  return chrome_common_net::DNS_PROBE_FINISHED_UNKNOWN;
+}
+
+// TODO(ttuttle): Make sure we're not changing result histogram mappings going
+// from DnsProbeJob to DnsProbeRunner.
 void DnsProbeService::HistogramProbes() const {
-  const DnsProbeResult kMaxResult = chrome_common_net::DNS_PROBE_MAX;
+  const DnsProbeStatus kMaxStatus = chrome_common_net::DNS_PROBE_MAX;
 
   DCHECK_EQ(STATE_RESULTS_CACHED, state_);
-  DCHECK_NE(kMaxResult, result_);
+  DCHECK(chrome_common_net::DnsProbeStatusIsFinished(result_));
 
   base::TimeDelta elapsed = base::Time::Now() - probe_start_time_;
 
-  UMA_HISTOGRAM_ENUMERATION("DnsProbe.Probe.Result", result_, kMaxResult);
-  UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Probe.Elapsed", elapsed);
+  UMA_HISTOGRAM_ENUMERATION("DnsProbe.Status", result_, kMaxStatus);
+  UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Elapsed", elapsed);
 
   if (NetworkChangeNotifier::IsOffline()) {

[mmenke, 2013/06/12 19:17:12]

Random comment that can be ignored for now:  Long term, we may want to remove
this - it's been known to cause jank on windows.

-    UMA_HISTOGRAM_ENUMERATION("DnsProbe.Probe.NcnOffline.Result",
-                              result_, kMaxResult);
-    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Probe.NcnOffline.Elapsed", elapsed);
+    UMA_HISTOGRAM_ENUMERATION("DnsProbe.Status_NcnOffline",
+                              result_, kMaxStatus);
+    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Elapsed_NcnOffline", elapsed);
   } else {
-    UMA_HISTOGRAM_ENUMERATION("DnsProbe.Probe.NcnOnline.Result",
-                              result_, kMaxResult);
-    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Probe.NcnOnline.Elapsed", elapsed);
+    UMA_HISTOGRAM_ENUMERATION("DnsProbe.Status_NcnOnline",
+                              result_, kMaxStatus);
+    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Elapsed_NcnOnline", elapsed);
   }
 
   switch (result_) {
-  case chrome_common_net::DNS_PROBE_UNKNOWN:
-    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Probe.ResultUnknown.Elapsed",
+  case chrome_common_net::DNS_PROBE_FINISHED_UNKNOWN:
+    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Elapsed_Unknown",
                                elapsed);
     break;
-  case chrome_common_net::DNS_PROBE_NO_INTERNET:
-    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Probe.ResultNoInternet.Elapsed",
+  case chrome_common_net::DNS_PROBE_FINISHED_NO_INTERNET:
+    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Elapsed_NoInternet",
                                elapsed);
     break;
-  case chrome_common_net::DNS_PROBE_BAD_CONFIG:
-    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Probe.ResultBadConfig.Elapsed",
+  case chrome_common_net::DNS_PROBE_FINISHED_BAD_CONFIG:
+    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Elapsed_BadConfig",

[mmenke, 2013/06/12 19:17:12]

These should all pretty much represent the same thing as the old histograms,
right?  Other than the fact we're removing that field trial.

[Deprecated (see juliatuttle), 2013/06/13 14:37:04]

Right.

                                elapsed);
-
-    // Histogram some extra data to see why BAD_CONFIG is happening.
-    UMA_HISTOGRAM_ENUMERATION(
-        "DnsProbe.Probe.ResultBadConfig.SystemJobResult",
-        system_result_,
-        DnsProbeJob::MAX_RESULT);
-    UMA_HISTOGRAM_CUSTOM_COUNTS(
-        "DnsProbe.Probe.ResultBadConfig.SystemNameserverCount",
-        system_nameserver_count_,
-        0, kNameserverCountMax, kNameserverCountMax + 1);
-    UMA_HISTOGRAM_BOOLEAN(
-        "DnsProbe.Probe.ResultBadConfig.SystemIsLocalhost",
-        system_is_localhost_);
     break;
-  case chrome_common_net::DNS_PROBE_NXDOMAIN:
-    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Probe.ResultNxdomain.Elapsed",
+  case chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN:
+    UMA_HISTOGRAM_MEDIUM_TIMES("DnsProbe.Elapsed_Nxdomain",
                                elapsed);
     break;
+
+  // These aren't actually results.
+  case chrome_common_net::DNS_PROBE_POSSIBLE:
+  case chrome_common_net::DNS_PROBE_NOT_RUN:
+  case chrome_common_net::DNS_PROBE_STARTED:
   case chrome_common_net::DNS_PROBE_MAX:
     NOTREACHED();
     break;
   }
 }
 
-DnsProbeResult DnsProbeService::EvaluateResults() const {
-  DCHECK_NE(DnsProbeJob::SERVERS_UNKNOWN, system_result_);
-  DCHECK_NE(DnsProbeJob::SERVERS_UNKNOWN, public_result_);
-
-  // If the system DNS is working, assume the domain doesn't exist.
-  if (system_result_ == DnsProbeJob::SERVERS_CORRECT)
-    return chrome_common_net::DNS_PROBE_NXDOMAIN;
-
-  // If the system DNS is not working but another public server is, assume the
-  // DNS config is bad (or perhaps the DNS servers are down or broken).
-  if (public_result_ == DnsProbeJob::SERVERS_CORRECT)
-    return chrome_common_net::DNS_PROBE_BAD_CONFIG;
-
-  // If the system DNS is not working and another public server is unreachable,
-  // assume the internet connection is down (note that system DNS may be a
-  // router on the LAN, so it may be reachable but returning errors.)
-  if (public_result_ == DnsProbeJob::SERVERS_UNREACHABLE)
-    return chrome_common_net::DNS_PROBE_NO_INTERNET;
-
-  // Otherwise: the system DNS is not working and another public server is
-  // responding but with errors or incorrect results.  This is an awkward case;
-  // an invasive captive portal or a restrictive firewall may be intercepting
-  // or rewriting DNS traffic, or the public server may itself be failing or
-  // down.
-  return chrome_common_net::DNS_PROBE_UNKNOWN;
-}
-
 void DnsProbeService::CallCallbacks() {
   DCHECK_EQ(STATE_RESULTS_CACHED, state_);
-  DCHECK(!callbacks_.empty());
+  DCHECK(chrome_common_net::DnsProbeStatusIsFinished(result_));
+  DCHECK(!pending_callbacks_.empty());
 
-  std::vector<CallbackType> callbacks = callbacks_;
-  callbacks_.clear();
+  std::vector<ProbeCallback> callbacks = pending_callbacks_;
+  pending_callbacks_.clear();
 
-  for (std::vector<CallbackType>::const_iterator i = callbacks.begin();
+  for (std::vector<ProbeCallback>::const_iterator i = callbacks.begin();
        i != callbacks.end(); ++i) {
     i->Run(result_);
   }
 }
 
-scoped_ptr<DnsProbeJob> DnsProbeService::CreateProbeJob(
-    const DnsConfig& dns_config,
-    const DnsProbeJob::CallbackType& job_callback) {
-  if (!dns_config.IsValid())
-    return scoped_ptr<DnsProbeJob>(NULL);
-
-  scoped_ptr<DnsClient> dns_client(DnsClient::CreateClient(NULL));
-  dns_client->SetConfig(dns_config);
-  return DnsProbeJob::CreateJob(dns_client.Pass(), job_callback, NULL);
-}
-
-void DnsProbeService::OnProbeJobComplete(DnsProbeJob* job,
-                                         DnsProbeJob::Result result) {
-  DCHECK_EQ(STATE_PROBE_RUNNING, state_);
-
-  if (job == system_job_.get()) {
-    system_result_ = result;
-    system_job_.reset();
-  } else if (job == public_job_.get()) {
-    public_result_ = result;
-    public_job_.reset();
-  } else {
-    NOTREACHED();
-    return;
-  }
-
-  if (system_result_ != DnsProbeJob::SERVERS_UNKNOWN &&
-      public_result_ != DnsProbeJob::SERVERS_UNKNOWN) {
-    OnProbesComplete();
+void DnsProbeService::ExpireResult() {
+  if (state_ == STATE_RESULTS_CACHED) {
+    state_ = STATE_NO_RESULTS;
+    result_ = chrome_common_net::DNS_PROBE_MAX;
   }
 }
 
-void DnsProbeService::GetSystemDnsConfig(DnsConfig* config) {
-  NetworkChangeNotifier::GetDnsConfig(config);
-
-  // DNS probes don't need or want the suffix search list populated
-  config->search.clear();
-
-  if (dns_attempts_ != kAttemptsUseDefault)
-    config->attempts = dns_attempts_;
-
-  // Take notes in case the config turns out to be bad, so we can histogram
-  // some useful data.
-  system_nameserver_count_ = config->nameservers.size();
-  system_is_localhost_ = (system_nameserver_count_ == 1)
-                         && IsLocalhost(config->nameservers[0].address());
-
-  // Disable port randomization.
-  config->randomize_ports = false;
-}
-
-void DnsProbeService::GetPublicDnsConfig(DnsConfig* config) {
-  *config = DnsConfig();
-
-  config->nameservers.push_back(MakeDnsEndPoint(kPublicDnsPrimary));
-  config->nameservers.push_back(MakeDnsEndPoint(kPublicDnsSecondary));
-
-  if (dns_attempts_ != kAttemptsUseDefault)
-    config->attempts = dns_attempts_;
-
-  // Disable port randomization.
-  config->randomize_ports = false;
-}
-
 bool DnsProbeService::ResultsExpired() {
   const base::TimeDelta kMaxResultAge =
       base::TimeDelta::FromMilliseconds(kMaxResultAgeMs);
   return base::Time::Now() - probe_start_time_ > kMaxResultAge;
 }
 
-} // namespace chrome_browser_net
+}  // namespace chrome_browser_net