Fix auto-reload histograms.

chrome/renderer/net/net_error_helper_core.h

 // Copyright 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.
 
 #ifndef CHROME_RENDERER_NET_NET_ERROR_HELPER_CORE_H_
 #define CHROME_RENDERER_NET_NET_ERROR_HELPER_CORE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 93 matching lines @@
   //
   // Updates the NetErrorHelper with the assumption the page will be loaded
   // immediately.
   void GetErrorHTML(FrameType frame_type,
                     const blink::WebURLError& error,
                     bool is_failed_post,
                     std::string* error_html);
 
   // These methods handle tracking the actual state of the page.
   void OnStartLoad(FrameType frame_type, PageType page_type);
-  void OnCommitLoad(FrameType frame_type);
+  void OnCommitLoad(FrameType frame_type, const GURL& url);
   void OnFinishLoad(FrameType frame_type);
   void OnStop();
 
   void CancelPendingFetches();
 
   // Called when an error page have has been retrieved over the network.  |html|
   // must be an empty string on error.
   void OnNavigationCorrectionsFetched(const std::string& corrections,
                                       const std::string& accept_languages,
                                       bool is_rtl);
@@ skipping 73 matching lines @@
   // Information for the committed error page.  NULL when the committed page is
   // not an error page.
   scoped_ptr<ErrorPageInfo> committed_error_page_info_;
 
   GURL navigation_correction_url_;
   std::string language_;
   std::string country_code_;
   std::string api_key_;
   GURL search_url_;
 
+  // True if auto-reload is enabled at all.
   bool auto_reload_enabled_;
+
+  // Timer used to wait for auto-reload attempts.
   scoped_ptr<base::Timer> auto_reload_timer_;
 
+  // True if the auto-reload timer would be running but is waiting for an
+  // offline->online network transition.
+  bool auto_reload_timer_paused_;

[Randy Smith (Not in Mondays), 2014/04/30 18:22:16]

Strictly speaking (IIUC), this isn't pausing the timer as pausing the retry; the
timer will always run for a full interval from the backoffs intervals, or not be
running.  It won't go partway through the interval, stop for a while, and then
finish the interval.  If you agree with this pedantry, maybe change the variable
name?

[Elly Fong-Jones, 2014/05/01 18:33:03]

Done.

+
+  // True if there is an uncommitted-but-started load. This is used to inhibit

[Randy Smith (Not in Mondays), 2014/04/30 18:22:16]

nit, suggestion: Maybe add "of either an error or a non-error page" to the end
of the first sentence?  When I first read this, I thought this only marked
non-error loads (no reason for that, it was just my assumption) and that
clarification would prevent that misunderstanding.

[Elly Fong-Jones, 2014/05/01 18:33:03]

Done.

+  // starting auto-reload when an error page finishes, in case this happens:
+  //   Error page starts
+  //   Error page commits
+  //   Non-error page starts
+  //   Error page finishes
+  bool uncommitted_load_started_;
+
   // Is the browser online?
   bool online_;
 
   int auto_reload_count_;
-  bool can_auto_reload_page_;
 
   // Non-NO_BUTTON only when a navigation has been initiated from the error
   // page.  Used to detect when such navigations result in errors.
   Button navigation_from_button_;
 };
 
 #endif  // CHROME_RENDERER_NET_NET_ERROR_HELPER_CORE_H_