Support auto-reload on errors.

chrome/renderer/net/net_error_helper.cc

 // 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.
 
 #include "chrome/renderer/net/net_error_helper.h"
 
 #include <string>
 
 #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/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"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/resource_fetcher.h"
 #include "grit/renderer_resources.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
@@ skipping 31 matching lines @@
 }
 
 NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) {
   if (!frame->parent())
     return NetErrorHelperCore::MAIN_FRAME;
   return NetErrorHelperCore::SUB_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() {
 }
 
 void NetErrorHelper::DidStartProvisionalLoad() {
   blink::WebFrame* frame = render_frame()->GetWebFrame();
   core_.OnStartLoad(GetFrameType(frame), GetLoadingPageType(frame));
 }
 
@@ skipping 131 matching lines @@
   // The fetcher may only be deleted after |data| is passed to |core_|.  Move
   // it to a temporary to prevent any potential re-entrancy issues.
   scoped_ptr<content::ResourceFetcher> fetcher(
       alt_error_page_fetcher_.release());
   if (!response.isNull() && response.httpStatusCode() == 200) {
     core_.OnAlternateErrorPageFetched(data);
   } else {
     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);
+}