Display DNS probe results.

chrome/renderer/net/net_error_helper.h

Index: chrome/renderer/net/net_error_helper.h
diff --git a/chrome/renderer/net/net_error_helper.h b/chrome/renderer/net/net_error_helper.h
index 48362513a4e71869fbb0d7b4a39f8e9463f7c65c..004bef659e228231f1eabf2c56e2db20d5cca421 100644
--- a/chrome/renderer/net/net_error_helper.h
+++ b/chrome/renderer/net/net_error_helper.h
@@ -5,9 +5,17 @@
 #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 "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h"
+
+namespace base {
+class DictionaryValue;
+}
 
 namespace WebKit {
 class WebFrame;
@@ -31,14 +39,31 @@ class NetErrorHelper : public content::RenderViewObserver {
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
+  static bool GetErrorStringsForDnsProbe(
+      const WebKit::WebURLError& error,
+      base::DictionaryValue* strings,
+      const std::string& locale);
+
  private:
-  void OnNetErrorInfo(int dns_probe_result);
-  void TrackerCallback(NetErrorTracker::DnsErrorPageState state);
-  void UpdateErrorPage(chrome_common_net::DnsProbeResult dns_probe_result);
+  enum State {
+    IDLE,                  // Helper is not currently handling a DNS error
+    AWAITING_INITIAL_IPC,  // Helper is awaiting STARTED or NOT_RUN IPC
+    AWAITING_PROBE_RESULT  // Helper is awaiting FINISHED IPC to update page
+  };
+
+  void TrackerCallback(
+      NetErrorTracker::DnsErrorPageState state);

[mmenke, 2013/04/10 16:56:58]

nit:  Does this fit on single line?

[Deprecated (see juliatuttle), 2013/04/10 23:42:32]

Done.

+  void OnNetErrorInfo(int status);
+
+  void UpdateErrorPage();
+  WebKit::WebURLError MakeUpdatedError();
+
+  State state_;
+
+  WebKit::WebURLError last_error_;
+  chrome_common_net::DnsProbeStatus last_status_;
 
   NetErrorTracker tracker_;
-  NetErrorTracker::DnsErrorPageState dns_error_page_state_;
-  bool updated_error_page_;
 };
 
 #endif  // CHROME_RENDERER_NET_NET_ERROR_HELPER_H_