Display DNS probe results.

chrome/renderer/net/net_error_helper.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_RENDERER_NET_NET_ERROR_HELPER_H_
 #define CHROME_RENDERER_NET_NET_ERROR_HELPER_H_
 
+#include <string>
+
 #include "chrome/common/net/net_error_info.h"
-#include "chrome/common/net/net_error_tracker.h"
 #include "content/public/renderer/render_view_observer.h"
+#include "third_party/WebKit/public/platform/WebURLError.h"
+
+namespace base {
+class DictionaryValue;
+}
 
 namespace WebKit {
 class WebFrame;
 }
 
+// Listens for NetErrorInfo messages from the NetErrorTabHelper on the
+// browser side and updates the error page with more details (currently, just
+// DNS probe results) if/when available.
 class NetErrorHelper : public content::RenderViewObserver {
  public:
   explicit NetErrorHelper(content::RenderView* render_view);
   virtual ~NetErrorHelper();
 
   // RenderViewObserver implementation.
   virtual void DidStartProvisionalLoad(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidFailProvisionalLoad(
       WebKit::WebFrame* frame,
       const WebKit::WebURLError& error) OVERRIDE;
   virtual void DidCommitProvisionalLoad(
       WebKit::WebFrame* frame,
       bool is_new_navigation) OVERRIDE;
   virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE;
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
+  static bool GetErrorStringsForDnsProbe(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLError& error,
+      bool is_failed_post,
+      const std::string& locale,
+      base::DictionaryValue* error_strings);
+
+ protected:
+  // These methods handle tracking the actual state of the page; this allows
+  // unit-testing of the state tracking without having to mock out WebFrames
+  // and such.
+  void OnStartLoad(bool is_main_frame, bool is_error_page);
+  void OnFailLoad(bool is_main_frame, bool is_dns_error);
+  void OnCommitLoad(bool is_main_frame);
+  void OnFinishLoad(bool is_main_frame);
+
+  void OnNetErrorInfo(int status);
+  virtual void UpdateErrorPage();
+
+  // The last DnsProbeStatus received from the browser.
+  chrome_common_net::DnsProbeStatus last_status_;

[mmenke, 2013/06/13 20:04:55]

nit:  Suggest renaming this last_probe_status_, to make it clear it's not the
status of the page load, or of the Helper.

[Deprecated (see juliatuttle), 2013/06/18 19:36:37]

Done.

+
  private:
-  void OnNetErrorInfo(int dns_probe_result);
-  void TrackerCallback(NetErrorTracker::DnsErrorPageState state);
-  void UpdateErrorPage(chrome_common_net::DnsProbeResult dns_probe_result);
+  WebKit::WebURLError GetUpdatedError() const;
 
-  NetErrorTracker tracker_;
-  NetErrorTracker::DnsErrorPageState dns_error_page_state_;
-  bool updated_error_page_;
+  // True if the last provisional load started was an error page.
+  bool is_error_page_;
+
+  // True if the helper has seen a main frame page load fail with a DNS error,
+  // but has not yet seen a new page load successfully afterwards.
+  bool dns_error_active_;
+
+  // True if the helper has seen the page finish loading, but has not yet seen
+  // a new provisional load commit.
+  bool page_loaded_;
+
+  // The last main frame error seen by the helper.
+  WebKit::WebURLError last_error_;
+
   bool is_failed_post_;
 };
 
 #endif  // CHROME_RENDERER_NET_NET_ERROR_HELPER_H_