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 7a011b1429682b6126722a77542624fcc6c25600..361a7ab28a2f6f5b2226176f59b71c2842e7aa19 100644
--- a/chrome/renderer/net/net_error_helper.cc
+++ b/chrome/renderer/net/net_error_helper.cc
@@ -6,13 +6,16 @@
 
 #include <string>
 
+#include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/chrome_switches.h"
 #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"
@@ -67,10 +70,17 @@ NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) {
 NetErrorHelper::NetErrorHelper(RenderFrame* render_view)
     : RenderFrameObserver(render_view),
       content::RenderFrameObserverTracker<NetErrorHelper>(render_view),
-      core_(this) {
+      core_(this,
+            scoped_ptr<MockableOneShotTimer>(new MockableOneShotTimer())) {

[mmenke, 2014/03/11 20:07:54]

Optional:  I think it's a little cleaner to to remove MockableOneShotTimer from
this file, and have core create it itself.  Then add a set_timer_for_testing (Or
SetTimerForTesting) to core.

I think it's cleaner not to have this class know that detail of Core.  If you
think this is cleaner, or are paranoid about the timer being started on
construction, that's fine.

[Elly Fong-Jones, 2014/03/12 15:08:58]

Done.

+  RenderThread::Get()->AddObserver(this);
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  bool auto_reload_enabled =
+      command_line->HasSwitch(switches::kEnableOfflineAutoReload);
+  core_.set_auto_reload_enabled(auto_reload_enabled);
 }
 
 NetErrorHelper::~NetErrorHelper() {
+  RenderThread::Get()->RemoveObserver(this);
 }
 
 void NetErrorHelper::DidStartProvisionalLoad() {
@@ -104,6 +114,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 +126,11 @@ void NetErrorHelper::GetErrorHTML(
   core_.GetErrorHTML(GetFrameType(frame), error, is_failed_post, error_html);
 }
 
+bool NetErrorHelper::ShouldSuppressErrorPage(blink::WebFrame* frame,
+                                             const GURL& url) {
+  return core_.ShouldSuppressErrorPage(GetFrameType(frame), url);
+}
+
 void NetErrorHelper::GenerateLocalizedErrorPage(const blink::WebURLError& error,
                                                 bool is_failed_post,
                                                 std::string* error_html) const {
@@ -196,6 +215,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);