| Index: chrome/browser/net/dns_probe_service.h
|
| diff --git a/chrome/browser/net/dns_probe_service.h b/chrome/browser/net/dns_probe_service.h
|
| index c40967acc10c64e35dc34b5739b580b9dcd4a150..46fd691c6b202cb9f5bc0419e43c4bf6f287d640 100644
|
| --- a/chrome/browser/net/dns_probe_service.h
|
| +++ b/chrome/browser/net/dns_probe_service.h
|
| @@ -22,7 +22,7 @@ namespace chrome_browser_net {
|
|
|
| class DnsProbeService : public net::NetworkChangeNotifier::IPAddressObserver {
|
| public:
|
| - typedef base::Callback<void(chrome_common_net::DnsProbeResult result)>
|
| + typedef base::Callback<void(chrome_common_net::DnsProbeStatus result)>
|
| CallbackType;
|
|
|
| DnsProbeService();
|
| @@ -49,7 +49,7 @@ class DnsProbeService : public net::NetworkChangeNotifier::IPAddressObserver {
|
| void CallCallbacks();
|
|
|
| void OnProbeJobComplete(DnsProbeJob* job, DnsProbeJob::Result result);
|
| - chrome_common_net::DnsProbeResult EvaluateResults() const;
|
| + chrome_common_net::DnsProbeStatus EvaluateResults() const;
|
| void HistogramProbes() const;
|
|
|
| // These are expected to be overridden by tests to return mock jobs.
|
| @@ -71,15 +71,11 @@ class DnsProbeService : public net::NetworkChangeNotifier::IPAddressObserver {
|
| DnsProbeJob::Result public_result_;
|
| std::vector<CallbackType> callbacks_;
|
| State state_;
|
| - chrome_common_net::DnsProbeResult result_;
|
| + chrome_common_net::DnsProbeStatus result_;
|
| base::Time probe_start_time_;
|
| // How many DNS request attempts the probe jobs will make before giving up
|
| // (Overrides the attempts field in the system DnsConfig.)
|
| const int dns_attempts_;
|
| - // How many nameservers the system config has.
|
| - int system_nameserver_count_;
|
| - // Whether the only system nameserver is 127.0.0.1.
|
| - bool system_is_localhost_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DnsProbeService);
|
| };
|
|
|