Support auto-reload on errors.

chrome/renderer/net/net_error_helper.cc

Index: chrome/renderer/net/net_error_helper.cc
diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc
index af615f7243d3527f17163657c1a88c78c17352ff..51b218b3c7ca229414f6174a5d4a9bef51989928 100644
--- a/chrome/renderer/net/net_error_helper.cc
+++ b/chrome/renderer/net/net_error_helper.cc
@@ -13,6 +13,7 @@
 #include "chrome/common/localized_error.h"
 #include "chrome/common/net/net_error_info.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/renderer/net/mockable_one_shot_timer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/content_renderer_client.h"
@@ -64,10 +65,13 @@ NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) {
 
 }  // namespace
 
-NetErrorHelper::NetErrorHelper(RenderFrame* render_view)
+NetErrorHelper::NetErrorHelper(RenderFrame* render_view,
+                               bool auto_reload_enabled)
     : RenderFrameObserver(render_view),
       content::RenderFrameObserverTracker<NetErrorHelper>(render_view),
-      core_(this) {
+      core_(this,
+            scoped_ptr<MockableOneShotTimer>(new MockableOneShotTimer())) {
+  core_.set_auto_reload_enabled(auto_reload_enabled);

[Randy Smith (Not in Mondays), 2014/02/26 00:07:38]

See earlier comment; why not directly into the constructor?

[Elly Fong-Jones, 2014/03/03 19:31:07]

so test fixtures can construct the NetErrorHelperCore and individual tests can
enable/disable autoreload as needed.

 }
 
 NetErrorHelper::~NetErrorHelper() {
@@ -104,6 +108,10 @@ bool NetErrorHelper::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
+void NetErrorHelper::NetworkStateChanged(bool enabled) {
+  core_.NetworkStateChanged(enabled);
+}
+
 void NetErrorHelper::GetErrorHTML(
     blink::WebFrame* frame,
     const blink::WebURLError& error,
@@ -112,6 +120,10 @@ void NetErrorHelper::GetErrorHTML(
   core_.GetErrorHTML(GetFrameType(frame), error, is_failed_post, error_html);
 }
 
+bool NetErrorHelper::ShouldSuppressErrorPage(const GURL& url) {
+  return core_.ShouldSuppressErrorPage(url);
+}
+
 void NetErrorHelper::GenerateLocalizedErrorPage(const blink::WebURLError& error,
                                                 bool is_failed_post,
                                                 std::string* error_html) const {
@@ -194,6 +206,10 @@ void NetErrorHelper::CancelFetchErrorPage() {
   alt_error_page_fetcher_.reset();
 }
 
+void NetErrorHelper::ReloadPage() {
+  render_frame()->GetWebFrame()->reload(false);
+}
+
 void NetErrorHelper::OnNetErrorInfo(int status_num) {
   DCHECK(status_num >= 0 && status_num < chrome_common_net::DNS_PROBE_MAX);