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..3c5d1eda45f3e808f6c9ce84b6f6aeee664b7f58 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())) {

[mmenke, 2014/02/14 17:56:10]

nit:  Fix indent.

[Elly Fong-Jones, 2014/02/25 19:19:52]

Done.

+  core_.set_auto_reload_enabled(auto_reload_enabled);

[mmenke, 2014/02/14 17:56:10]

Can you just make this a constructor parameter?

[Elly Fong-Jones, 2014/02/25 19:19:52]

I did it this way instead so that the test code that constructs these objects
only has to specify this if it cares about it, and because I hate proliferating
constructor parameters.

 }
 
 NetErrorHelper::~NetErrorHelper() {
@@ -219,3 +223,15 @@ void NetErrorHelper::OnAlternateErrorPageRetrieved(
     core_.OnAlternateErrorPageFetched("");
   }
 }
+
+void NetErrorHelper::ReloadPage() {
+  render_frame()->GetWebFrame()->reload(false);
+}
+
+void NetErrorHelper::NetworkStateChanged(bool enabled) {
+  core_.NetworkStateChanged(enabled);
+}
+
+bool NetErrorHelper::ShouldSuppressErrorPage(const GURL& url) {

[mmenke, 2014/02/14 17:56:10]

Definition order should match declaration order

[Elly Fong-Jones, 2014/02/25 19:19:52]

Done.

+  return core_.ShouldSuppressErrorPage(url);
+}