Fix auto-reload histograms.

chrome/renderer/net/net_error_helper_core_unittest.cc

Index: chrome/renderer/net/net_error_helper_core_unittest.cc
diff --git a/chrome/renderer/net/net_error_helper_core_unittest.cc b/chrome/renderer/net/net_error_helper_core_unittest.cc
index f30030e65713332b7b53b7fa9c65458a81ed0f75..1ed032a8e5902a594cfc421a92bb47c556ba267c 100644
--- a/chrome/renderer/net/net_error_helper_core_unittest.cc
+++ b/chrome/renderer/net/net_error_helper_core_unittest.cc
@@ -6,11 +6,13 @@
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/metrics/statistics_recorder.h"
 #include "base/strings/stringprintf.h"
 #include "base/timer/mock_timer.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/common/net/net_error_info.h"
+#include "chrome/test/base/uma_histogram_helper.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
@@ -120,7 +122,8 @@ class NetErrorHelperCoreTest : public testing::Test,
                              error_html_update_count_(0),
                              reload_count_(0),
                              load_stale_count_(0),
-                             enable_page_helper_functions_count_(0) {
+                             enable_page_helper_functions_count_(0),
+                             default_url_(GURL(kFailedUrl)) {
     core_.set_auto_reload_enabled(false);
     core_.set_timer_for_testing(scoped_ptr<base::Timer>(timer_));
   }
@@ -130,6 +133,10 @@ class NetErrorHelperCoreTest : public testing::Test,
     EXPECT_FALSE(is_url_being_fetched());
   }
 
+  virtual void SetUp() {
+    base::StatisticsRecorder::Initialize();
+  }
+
   NetErrorHelperCore& core() { return core_; }
 
   const GURL& url_being_fetched() const { return url_being_fetched_; }
@@ -147,6 +154,10 @@ class NetErrorHelperCoreTest : public testing::Test,
     return load_stale_url_;
   }
 
+  const GURL& default_url() const {
+    return default_url_;
+  }
+
   int enable_page_helper_functions_count() const {
     return enable_page_helper_functions_count_;
   }
@@ -189,14 +200,14 @@ class NetErrorHelperCoreTest : public testing::Test,
 
     core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                        NetErrorHelperCore::ERROR_PAGE);
-    core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+    core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());

[mmenke, 2014/04/25 14:57:42]

GURL(kUnreachableWebDataURL)

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

     core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   }
 
   void DoSuccessLoad() {
     core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                        NetErrorHelperCore::NON_ERROR_PAGE);
-    core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+    core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
     core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   }
 
@@ -311,6 +322,8 @@ class NetErrorHelperCoreTest : public testing::Test,
   GURL load_stale_url_;
 
   int enable_page_helper_functions_count_;
+
+  GURL default_url_;
 };
 
 //------------------------------------------------------------------------------
@@ -324,7 +337,7 @@ TEST_F(NetErrorHelperCoreTest, Null) {
 TEST_F(NetErrorHelperCoreTest, SuccessfulPageLoad) {
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::NON_ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
   EXPECT_EQ(0, error_html_update_count());
@@ -334,7 +347,7 @@ TEST_F(NetErrorHelperCoreTest, SuccessfulPageLoadWithNavigationCorrections) {
   EnableNavigationCorrections();
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::NON_ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
   EXPECT_EQ(0, error_html_update_count());
@@ -357,7 +370,7 @@ TEST_F(NetErrorHelperCoreTest, MainFrameNonDnsError) {
   EXPECT_EQ(0, enable_page_helper_functions_count());
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());

[mmenke, 2014/04/25 14:57:42]

Error page commits should use GURL(kUnreachableWebDataURL)

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
   EXPECT_EQ(0, error_html_update_count());
@@ -382,7 +395,7 @@ TEST_F(NetErrorHelperCoreTest, MainFrameNonDnsErrorWithCorrections) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
   EXPECT_EQ(0, error_html_update_count());
@@ -413,7 +426,7 @@ TEST_F(NetErrorHelperCoreTest, MainFrameNonDnsErrorSpuriousStatus) {
                      NetErrorHelperCore::ERROR_PAGE);
   core().OnNetErrorInfo(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN);
 
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnNetErrorInfo(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN);
 
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
@@ -439,7 +452,7 @@ TEST_F(NetErrorHelperCoreTest, SubFrameDnsError) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::SUB_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::SUB_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::SUB_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::SUB_FRAME);
   EXPECT_EQ(0, update_count());
   EXPECT_EQ(0, error_html_update_count());
@@ -463,7 +476,7 @@ TEST_F(NetErrorHelperCoreTest, SubFrameDnsErrorWithCorrections) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::SUB_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::SUB_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::SUB_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::SUB_FRAME);
   EXPECT_EQ(0, update_count());
   EXPECT_EQ(0, error_html_update_count());
@@ -493,7 +506,7 @@ TEST_F(NetErrorHelperCoreTest, SubFrameDnsErrorSpuriousStatus) {
                      NetErrorHelperCore::ERROR_PAGE);
   core().OnNetErrorInfo(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN);
 
-  core().OnCommitLoad(NetErrorHelperCore::SUB_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::SUB_FRAME, default_url());
   core().OnNetErrorInfo(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN);
 
   core().OnFinishLoad(NetErrorHelperCore::SUB_FRAME);
@@ -526,7 +539,7 @@ TEST_F(NetErrorHelperCoreTest, FinishedBeforeProbe) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
 
@@ -564,7 +577,7 @@ TEST_F(NetErrorHelperCoreTest, FinishedBeforeProbeNotRun) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
 
@@ -598,7 +611,7 @@ TEST_F(NetErrorHelperCoreTest, FinishedBeforeProbeInconclusive) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
 
@@ -636,7 +649,7 @@ TEST_F(NetErrorHelperCoreTest, FinishedBeforeProbeNoInternet) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
 
@@ -675,7 +688,7 @@ TEST_F(NetErrorHelperCoreTest, FinishedBeforeProbeBadConfig) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
 
@@ -715,7 +728,7 @@ TEST_F(NetErrorHelperCoreTest, FinishedAfterStartProbe) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
 
   // Nothing should be done when a probe status comes in before loading
   // finishes.
@@ -762,7 +775,7 @@ TEST_F(NetErrorHelperCoreTest, FinishedBeforeProbePost) {
   EXPECT_EQ(0, enable_page_helper_functions_count());
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(0, update_count());
   EXPECT_EQ(1, enable_page_helper_functions_count());
@@ -806,7 +819,7 @@ TEST_F(NetErrorHelperCoreTest, ProbeFinishesEarly) {
   core().OnNetErrorInfo(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN);
   EXPECT_EQ(0, update_count());
 
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   EXPECT_EQ(0, update_count());
 
   // When loading finishes, however, the buffered probe status should be sent
@@ -840,7 +853,7 @@ TEST_F(NetErrorHelperCoreTest, TwoErrorsWithProbes) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Probe results come in.
@@ -866,7 +879,7 @@ TEST_F(NetErrorHelperCoreTest, TwoErrorsWithProbes) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(2, update_count());
 
@@ -902,7 +915,7 @@ TEST_F(NetErrorHelperCoreTest, TwoErrorsWithProbesAfterSecondStarts) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // The process starts again.
@@ -930,7 +943,7 @@ TEST_F(NetErrorHelperCoreTest, TwoErrorsWithProbesAfterSecondStarts) {
             last_error_html());
 
   // Second page finishes loading, and is updated using the same probe result.
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(3, update_count());
   EXPECT_EQ(ProbeErrorString(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN),
@@ -976,7 +989,7 @@ TEST_F(NetErrorHelperCoreTest, ErrorPageLoadInterrupted) {
   EXPECT_EQ(ProbeErrorString(chrome_common_net::DNS_PROBE_POSSIBLE), html);
 
   // Error page finishes loading.
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Probe results come in.
@@ -1019,7 +1032,7 @@ TEST_F(NetErrorHelperCoreTest, NoCorrectionsForHttps) {
   // The blank page loads, no error page is loaded.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_FALSE(is_url_being_fetched());
   EXPECT_FALSE(last_error_page_params());
@@ -1056,7 +1069,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsReceivedBeforeProbe) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                       NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
 
   // Corrections retrieval starts when the error page finishes loading.
   EXPECT_FALSE(is_url_being_fetched());
@@ -1076,7 +1089,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsReceivedBeforeProbe) {
   // Corrections load.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                       NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Any probe statuses should be ignored.
@@ -1105,7 +1118,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsRetrievedAfterProbes) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
   EXPECT_FALSE(last_error_page_params());
@@ -1129,7 +1142,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsRetrievedAfterProbes) {
   // Corrections load.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(1, error_html_update_count());
   EXPECT_EQ(0, update_count());
@@ -1153,7 +1166,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsFailLoadNoProbes) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Corrections request fails, final error page is shown.
@@ -1168,7 +1181,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsFailLoadNoProbes) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // If probe statuses come in last from another page load, they should be
@@ -1197,7 +1210,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsFailLoadBeforeProbe) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Corrections request fails, probe pending page shown.
@@ -1212,7 +1225,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsFailLoadBeforeProbe) {
   // Probe page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Probe statuses comes in, and page is updated.
@@ -1249,7 +1262,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsFailAfterProbe) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Results come in, but end up being ignored.
@@ -1269,7 +1282,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsFailAfterProbe) {
   // Probe page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Probe statuses comes in, and page is updated.
@@ -1309,7 +1322,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsInterruptedBeforeCommit) {
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::NON_ERROR_PAGE);
   EXPECT_FALSE(is_url_being_fetched());
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   EXPECT_FALSE(is_url_being_fetched());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
@@ -1336,14 +1349,14 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsInterruptedBeforeLoad) {
   // The blank page starts loading and is committed.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
 
   // A new page load interrupts the original load.
   EXPECT_FALSE(is_url_being_fetched());
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::NON_ERROR_PAGE);
   EXPECT_FALSE(is_url_being_fetched());
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   EXPECT_FALSE(is_url_being_fetched());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
@@ -1370,7 +1383,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsInterrupted) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
 
@@ -1391,7 +1404,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsInterrupted) {
   EXPECT_TRUE(html.empty());
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   EXPECT_FALSE(is_url_being_fetched());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
@@ -1429,7 +1442,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsStopped) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   EXPECT_TRUE(is_url_being_fetched());
@@ -1454,7 +1467,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsStopped) {
   // The blank page loads again.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
 
@@ -1468,7 +1481,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsStopped) {
   // Probe page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Probe statuses comes in, and page is updated.
@@ -1504,7 +1517,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsDisabledBeforeFetch) {
                      NetErrorHelperCore::ERROR_PAGE);
   // Corrections is disabled.
   DisableNavigationCorrections();
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
   EXPECT_FALSE(last_error_page_params());
@@ -1520,7 +1533,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsDisabledBeforeFetch) {
   // Corrections load.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(1, error_html_update_count());
   EXPECT_EQ(0, update_count());
@@ -1544,7 +1557,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsDisabledDuringFetch) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
   EXPECT_FALSE(last_error_page_params());
@@ -1563,7 +1576,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsDisabledDuringFetch) {
   // Corrections load.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(1, error_html_update_count());
   EXPECT_EQ(0, update_count());
@@ -1590,7 +1603,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsWithoutSearch) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
   EXPECT_FALSE(last_error_page_params());
@@ -1611,7 +1624,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsWithoutSearch) {
   // Corrections load.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(1, error_html_update_count());
   EXPECT_EQ(0, update_count());
@@ -1638,7 +1651,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsOnlySearchSuggestion) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_TRUE(is_url_being_fetched());
   EXPECT_FALSE(last_error_page_params());
@@ -1659,7 +1672,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionsOnlySearchSuggestion) {
   // Corrections load.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_EQ(1, error_html_update_count());
   EXPECT_EQ(0, update_count());
@@ -1682,7 +1695,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionServiceReturnsNonJsonResult) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Corrections request fails, final error page is shown.
@@ -1697,7 +1710,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionServiceReturnsNonJsonResult) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 }
 
@@ -1719,7 +1732,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionServiceReturnsInvalidJsonResult) {
   // The blank page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 
   // Corrections request fails, final error page is shown.
@@ -1734,7 +1747,7 @@ TEST_F(NetErrorHelperCoreTest, CorrectionServiceReturnsInvalidJsonResult) {
   // Error page loads.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
 }
 
@@ -1790,8 +1803,9 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadStopsTimerOnStop) {
 TEST_F(NetErrorHelperCoreTest, AutoReloadStopsLoadingOnStop) {
   core().set_auto_reload_enabled(true);
   DoErrorLoad(net::ERR_CONNECTION_RESET);
-  EXPECT_EQ(1, core().auto_reload_count());
+  EXPECT_EQ(0, core().auto_reload_count());
   timer()->Fire();
+  EXPECT_EQ(1, core().auto_reload_count());
   EXPECT_EQ(1, reload_count());
   core().OnStop();
   EXPECT_FALSE(timer()->IsRunning());
@@ -1805,21 +1819,23 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadStopsOnOtherLoadStart) {
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::NON_ERROR_PAGE);
   EXPECT_FALSE(timer()->IsRunning());
-  EXPECT_EQ(1, core().auto_reload_count());
+  EXPECT_EQ(0, core().auto_reload_count());
 }
 
 TEST_F(NetErrorHelperCoreTest, AutoReloadResetsCountOnSuccess) {
   core().set_auto_reload_enabled(true);
   DoErrorLoad(net::ERR_CONNECTION_RESET);
   base::TimeDelta delay = timer()->GetCurrentDelay();
-  EXPECT_EQ(1, core().auto_reload_count());
+  EXPECT_EQ(0, core().auto_reload_count());
   timer()->Fire();
+  EXPECT_EQ(1, core().auto_reload_count());
   EXPECT_EQ(1, reload_count());
   DoSuccessLoad();
   DoErrorLoad(net::ERR_CONNECTION_RESET);
-  EXPECT_EQ(1, core().auto_reload_count());
+  EXPECT_EQ(0, core().auto_reload_count());
   EXPECT_EQ(timer()->GetCurrentDelay(), delay);
   timer()->Fire();
+  EXPECT_EQ(1, core().auto_reload_count());
   EXPECT_EQ(2, reload_count());
   DoSuccessLoad();
   EXPECT_EQ(0, core().auto_reload_count());
@@ -1865,7 +1881,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadStopsOnOfflineThenRestartsOnOnline) {
   EXPECT_FALSE(timer()->IsRunning());
   core().NetworkStateChanged(true);
   EXPECT_TRUE(timer()->IsRunning());
-  EXPECT_EQ(1, core().auto_reload_count());
+  EXPECT_EQ(0, core().auto_reload_count());
 }
 
 TEST_F(NetErrorHelperCoreTest, AutoReloadDoesNotRestartOnOnlineAfterStop) {
@@ -1911,7 +1927,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadSlowError) {
                       NetError(net::ERR_CONNECTION_RESET), false, &html);
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   EXPECT_FALSE(timer()->IsRunning());
   // Start a new non-error page load.
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
@@ -1920,7 +1936,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadSlowError) {
   // Finish the error page load.
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_FALSE(timer()->IsRunning());
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_FALSE(timer()->IsRunning());
 }
@@ -1935,7 +1951,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadOnlineSlowError) {
                       NetError(net::ERR_CONNECTION_RESET), false, &html);
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   EXPECT_FALSE(timer()->IsRunning());
   core().NetworkStateChanged(true);
   EXPECT_FALSE(timer()->IsRunning());
@@ -1960,7 +1976,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadOnlinePendingError) {
   core().NetworkStateChanged(true);
   EXPECT_FALSE(timer()->IsRunning());
   core().NetworkStateChanged(false);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   EXPECT_FALSE(timer()->IsRunning());
   core().NetworkStateChanged(true);
@@ -1977,7 +1993,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadOnlinePartialErrorReplacement) {
                       NetError(net::ERR_CONNECTION_RESET), false, &html);
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::ERROR_PAGE);
-  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME, default_url());
   core().OnFinishLoad(NetErrorHelperCore::MAIN_FRAME);
   core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
                      NetErrorHelperCore::NON_ERROR_PAGE);
@@ -1990,6 +2006,170 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadOnlinePartialErrorReplacement) {
   EXPECT_FALSE(timer()->IsRunning());
 }
 
+namespace {
+
+// Return the count for the named histogram, or 0 if there is no histogram by
+// that name. This function is error-tolerant because histograms that have no
+// data points may not be registered, and the unit tests below still need to be
+// able to check that they haven't changed.
+size_t GetHistogramCount(const char *name) {
+  base::HistogramBase* histogram =
+      base::StatisticsRecorder::FindHistogram(name);
+  if (!histogram)
+    return 0;
+  scoped_ptr<base::HistogramSamples> samples = histogram->SnapshotSamples();
+  if (!samples)
+    return 0;
+  return samples->TotalCount();
+}
+
+void ExpectHistogramDelta(const char *name, ssize_t old_count, ssize_t delta) {
+  ssize_t new_count = GetHistogramCount(name);
+  EXPECT_EQ(old_count + delta, new_count) << "For histogram " << name;
+}
+
+}  // namespace

[mmenke, 2014/04/25 14:57:42]

Can we just stick the entire file in an anonymous namespace?

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+
+class NetErrorHelperCoreHistogramTest : public NetErrorHelperCoreTest {
+ public:
+  virtual void SetUp() {

[mmenke, 2014/04/25 14:57:42]

OVERRIDE

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+    NetErrorHelperCoreTest::SetUp();
+    StoreOldCounts();
+    core().set_auto_reload_enabled(true);
+  }
+
+  void ExpectDelta(const char *name, int delta) {
+    DCHECK(old_counts_.count(name) == 1);
+    ExpectHistogramDelta(name, old_counts_[name], delta);
+  }
+
+  static const char *kCountAtStop;

[mmenke, 2014/04/25 14:57:42]

"static const char kCountAtStop[];" is preferred, I believe.

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+  static const char *kErrorAtStop;
+  static const char *kCountAtSuccess;
+  static const char *kErrorAtSuccess;
+  static const char *kErrorAtFirstSuccess;
+
+ private:
+  void StoreOldCounts() {
+    for (size_t i = 0; kHistogramNames[i]; i++)
+      old_counts_[kHistogramNames[i]] = GetHistogramCount(kHistogramNames[i]);
+  }
+
+  static const char *kHistogramNames[];
+
+  std::map<std::string, int> old_counts_;
+};
+
+const char *NetErrorHelperCoreHistogramTest::kCountAtStop =
+    "Net.AutoReload.CountAtStop";
+const char *NetErrorHelperCoreHistogramTest::kErrorAtStop =
+    "Net.AutoReload.ErrorAtStop";
+const char *NetErrorHelperCoreHistogramTest::kCountAtSuccess =
+    "Net.AutoReload.CountAtSuccess";
+const char *NetErrorHelperCoreHistogramTest::kErrorAtSuccess =
+    "Net.AutoReload.ErrorAtSuccess";
+const char *NetErrorHelperCoreHistogramTest::kErrorAtFirstSuccess =
+    "Net.AutoReload.ErrorAtFirstSuccess";
+const char *NetErrorHelperCoreHistogramTest::kHistogramNames[] = {
+  kCountAtStop,
+  kErrorAtStop,
+  kCountAtSuccess,
+  kErrorAtSuccess,
+  kErrorAtFirstSuccess,
+  NULL
+};
+
+// Test that the success histograms are updated when auto-reload succeeds at the
+// first attempt, and that the failure histograms are not updated.
+TEST_F(NetErrorHelperCoreHistogramTest, AutoReloadHistogramsAtFirstSuccess) {

[mmenke, 2014/04/25 14:57:42]

Think the name could be clearer (It is the name of the histogram, admittedly,
but the name of the histogram isn't terribly clear).  Maybe
AutoReloadHistogramsFirstReloadSucceeds?  Or just FirstAutoReloadSucceeds, since
Histogram is already in the test fixture name.  Also suggest renaming the other
tests similarly.

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+  DoErrorLoad(net::ERR_CONNECTION_RESET);
+  timer()->Fire();
+  DoSuccessLoad();
+
+  // All of CountAtSuccess, ErrorAtSuccess, and ErrorAtFirstSuccess should
+  // reflect this successful load. The failure histograms should be unchanged.
+  ExpectDelta(kCountAtSuccess, 1);
+  ExpectDelta(kErrorAtSuccess, 1);
+  ExpectDelta(kErrorAtFirstSuccess, 1);
+  ExpectDelta(kCountAtStop, 0);
+  ExpectDelta(kErrorAtStop, 0);
+}
+
+// Test that the success histograms are updated when auto-reload succeeds but
+// not on the first attempt, and that the first-success histogram is not
+// updated.
+TEST_F(NetErrorHelperCoreHistogramTest, AutoReloadHistogramsAtSuccess) {

[mmenke, 2014/04/25 14:57:42]

Suggest renaming this like the first test, but replacing first with second.

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+  DoErrorLoad(net::ERR_CONNECTION_RESET);
+  timer()->Fire();
+  DoErrorLoad(net::ERR_CONNECTION_RESET);
+  timer()->Fire();
+  DoSuccessLoad();
+
+  // CountAtSuccess and ErrorAtSuccess should reflect this successful load, but
+  // not ErrorAtFirstSuccess since it wasn't a first success.
+  ExpectDelta(kCountAtSuccess, 1);
+  ExpectDelta(kErrorAtSuccess, 1);
+  ExpectDelta(kErrorAtFirstSuccess, 0);

[mmenke, 2014/04/25 14:57:42]

Out of paranoia, may want to just include all histograms in all these tests.

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+}
+
+// Test that a user stop (caused by the user pressing the 'Stop' button)
+// registers as an auto-reload failure if an auto-reload attempt is in flight.

[mmenke, 2014/04/25 14:57:42]

Suggest mentioning these are also caused by cross-process navs, in this test and
the next.

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+TEST_F(NetErrorHelperCoreHistogramTest, AutoReloadHistogramsAtUserStop) {
+  DoErrorLoad(net::ERR_CONNECTION_RESET);
+  timer()->Fire();
+  core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
+                     NetErrorHelperCore::NON_ERROR_PAGE);
+  core().OnStop();
+
+  // CountAtStop and ErrorAtStop should reflect the failure.
+  ExpectDelta(kCountAtStop, 1);
+  ExpectDelta(kErrorAtStop, 1);
+}
+
+// Test that a user stop (caused by the user pressing the 'Stop' button) does
+// not register as an auto-reload failure if no auto-reload attempt is in
+// flight.
+TEST_F(NetErrorHelperCoreHistogramTest, AutoReloadHistogramsAtOtherLoad) {
+  DoErrorLoad(net::ERR_CONNECTION_RESET);
+  core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
+                     NetErrorHelperCore::NON_ERROR_PAGE);
+  core().OnStop();
+
+  ExpectDelta(kCountAtStop, 0);
+  ExpectDelta(kErrorAtStop, 0);
+}
+
+// Test that a commit of a different URL (caused by the user navigating to a
+// different page) with an auto-reload attempt in flight registers as an
+// auto-reload failure.
+TEST_F(NetErrorHelperCoreHistogramTest, AutoReloadHistogramsAtURLChange) {
+  const GURL kTestUrl("https://anotherurl");
+  DoErrorLoad(net::ERR_CONNECTION_RESET);
+  timer()->Fire();
+  core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
+                     NetErrorHelperCore::NON_ERROR_PAGE);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME,
+                      kTestUrl);

[mmenke, 2014/04/25 14:57:42]

Suggest having this one and the next call DidFinishLoad (OnFinishLoad? 
OnWillDidHaveSomeDayFinishedLoading?  Whatever)

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+
+  ExpectDelta(kCountAtStop, 1);
+  ExpectDelta(kErrorAtStop, 1);
+}
+
+// Test that a commit of the same URL with an auto-reload attempt in flight
+// registers as an auto-reload success.
+TEST_F(NetErrorHelperCoreHistogramTest, AutoReloadHistogramsAtURLNoChange) {
+  DoErrorLoad(net::ERR_CONNECTION_RESET);
+  timer()->Fire();
+  core().OnStartLoad(NetErrorHelperCore::MAIN_FRAME,
+                     NetErrorHelperCore::NON_ERROR_PAGE);
+  core().OnCommitLoad(NetErrorHelperCore::MAIN_FRAME,
+                      default_url());

[mmenke, 2014/04/25 14:57:42]

Maybe a test using the funky error page URL (Mentioned in the first comments),
too?

[Elly Fong-Jones, 2014/04/25 20:01:26]

Done.

+
+  ExpectDelta(kCountAtSuccess, 1);
+  ExpectDelta(kErrorAtSuccess, 1);
+  ExpectDelta(kErrorAtFirstSuccess, 1);
+}
+
 TEST_F(NetErrorHelperCoreTest, ShouldSuppressErrorPage) {
   // Set up the environment to test ShouldSuppressErrorPage: auto-reload is
   // enabled, an error page is loaded, and the auto-reload callback is running.