Display DNS probe results.

chrome/browser/net/net_error_tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/net_error_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/dns_probe_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/net/net_error_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 
 using base::FieldTrialList;
 using chrome_common_net::DnsProbeResult;
+using chrome_common_net::DnsProbeStatus;
 using content::BrowserContext;
 using content::BrowserThread;
 using content::PageTransition;
 using content::RenderViewHost;
 using content::WebContents;
 using content::WebContentsObserver;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome_browser_net::NetErrorTabHelper);
 
 namespace chrome_browser_net {
@@ skipping 31 matching lines @@
 NetErrorTracker::ErrorType GetErrorType(int net_error) {
   return IsDnsError(net_error) ? NetErrorTracker::ERROR_DNS
                                : NetErrorTracker::ERROR_OTHER;
 }
 
 void OnDnsProbeFinishedOnIOThread(
     const base::Callback<void(DnsProbeResult)>& callback,
     DnsProbeResult result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  DVLOG(1) << "DNS probe finished with result " << result;
-
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(callback, result));
 }
 
 // We can only access g_browser_process->io_thread() from the browser thread,
 // so we have to pass it in to the callback instead of dereferencing it here.
 void StartDnsProbeOnIOThread(
     const base::Callback<void(DnsProbeResult)>& callback,
     IOThread* io_thread) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  DVLOG(1) << "Starting DNS probe";
-
   DnsProbeService* probe_service =
       io_thread->globals()->dns_probe_service.get();
 
   probe_service->ProbeDns(base::Bind(&OnDnsProbeFinishedOnIOThread, callback));
 }
 
 }  // namespace
 
 NetErrorTabHelper::~NetErrorTabHelper() {
 }
@@ skipping 60 matching lines @@
       dns_error_page_state_(NetErrorTracker::DNS_ERROR_PAGE_NONE),
       dns_probe_state_(DNS_PROBE_NONE),
       enabled_by_trial_(GetEnabledByTrial()) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   InitializePref(contents);
 }
 
 void NetErrorTabHelper::TrackerCallback(
     NetErrorTracker::DnsErrorPageState state) {
+  DVLOG(1) << "Tracker state " << state;
+
   dns_error_page_state_ = state;
 
   MaybePostStartDnsProbeTask();
-  MaybeSendInfo();
+  MaybeSendStatus();
 }
 
 void NetErrorTabHelper::MaybePostStartDnsProbeTask() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (dns_error_page_state_ != NetErrorTracker::DNS_ERROR_PAGE_NONE &&
-      dns_probe_state_ != DNS_PROBE_STARTED &&
-      ProbesAllowed()) {
-    BrowserThread::PostTask(
-        BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(&StartDnsProbeOnIOThread,
-                   base::Bind(&NetErrorTabHelper::OnDnsProbeFinished,
-                              weak_factory_.GetWeakPtr()),
-                   g_browser_process->io_thread()));
-    dns_probe_state_ = DNS_PROBE_STARTED;
+  if (dns_error_page_state_ == NetErrorTracker::DNS_ERROR_PAGE_NONE ||
+      dns_probe_state_ != DNS_PROBE_NONE ||
+      !ProbesAllowed()) {
+    return;
   }
+
+  DVLOG(1) << "Starting probe.";
+
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&StartDnsProbeOnIOThread,
+                 base::Bind(&NetErrorTabHelper::OnDnsProbeFinished,
+                            weak_factory_.GetWeakPtr()),
+                 g_browser_process->io_thread()));
+  dns_probe_state_ = DNS_PROBE_STARTED;
 }
 
 void NetErrorTabHelper::OnDnsProbeFinished(DnsProbeResult result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(DNS_PROBE_STARTED, dns_probe_state_);
 
+  DVLOG(1) << "Finished probe with result " << result << ".";
+
   dns_probe_result_ = result;
   dns_probe_state_ = DNS_PROBE_FINISHED;
 
-  MaybeSendInfo();
+  MaybeSendStatus();
 }
 
-void NetErrorTabHelper::MaybeSendInfo() {
-  if (dns_error_page_state_ == NetErrorTracker::DNS_ERROR_PAGE_LOADED &&
-      dns_probe_state_ == DNS_PROBE_FINISHED) {
-    DVLOG(1) << "Sending result " << dns_probe_result_ << " to renderer";
-    Send(new ChromeViewMsg_NetErrorInfo(routing_id(), dns_probe_result_));
+void NetErrorTabHelper::MaybeSendStatus() {
+  if (dns_error_page_state_ != NetErrorTracker::DNS_ERROR_PAGE_LOADED)
+    return;
+
+  switch (dns_probe_state_) {
+  case DNS_PROBE_STARTED:
+    DVLOG(1) << "Error page loaded; sending STARTED.";
+    SendInfo(chrome_common_net::DNS_PROBE_STARTED,
+             chrome_common_net::DNS_PROBE_UNKNOWN);
+    break;
+
+  case DNS_PROBE_FINISHED:
+    DVLOG(1) << "Error page loaded; sending FINISHED.";
+    SendInfo(chrome_common_net::DNS_PROBE_FINISHED, dns_probe_result_);
     dns_probe_state_ = DNS_PROBE_NONE;
+    break;
+
+  case DNS_PROBE_NONE:
+    DVLOG(1) << "Error page loaded; sending NOT_RUN.";
+    SendInfo(chrome_common_net::DNS_PROBE_NOT_RUN,
+             chrome_common_net::DNS_PROBE_UNKNOWN);
+    break;
+
+  default:
+    NOTREACHED();
   }
 }
 
+void NetErrorTabHelper::SendInfo(
+    DnsProbeStatus status,
+    DnsProbeResult result)
+{

[mmenke, 2013/04/01 17:44:12]

nit:  "{" should go on previous line.

[Deprecated (see juliatuttle), 2013/04/09 20:35:49]

Done.

+  Send(new ChromeViewMsg_NetErrorInfo(routing_id(), status, result));
+}
+
 void NetErrorTabHelper::InitializePref(WebContents* contents) {
   DCHECK(contents);
 
   BrowserContext* browser_context = contents->GetBrowserContext();
   Profile* profile = Profile::FromBrowserContext(browser_context);
   resolve_errors_with_web_service_.Init(
       prefs::kAlternateErrorPagesEnabled,
       profile->GetPrefs());
 }
 
 bool NetErrorTabHelper::ProbesAllowed() const {
   if (testing_state_ != TESTING_DEFAULT)
     return testing_state_ == TESTING_FORCE_ENABLED;
 
   // TODO(ttuttle): Disable on mobile?
   return enabled_by_trial_ && *resolve_errors_with_web_service_;
 }
 
 }  // namespace chrome_browser_net