Added histograms to https://codereview.chromium.org/207553008/.

Also includes some nits from jar@'s review of that CL.

BUG=329620

R=jar@chromium.org
R=mmenke@chromium.org

Review URL: https://codereview.chromium.org/248123002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266711 0039d316-1c4b-4281-b951-d872f2087c98

chrome/renderer/net/net_error_helper_core.h

@@ -214,8 +214,9 @@ class NetErrorHelperCore {
   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.
+  // This value is set only when a navigation has been initiated from
+  // the error page.  It is used to detect when such navigations result
+  // in errors.
   Button navigation_from_button_;
 };
 

chrome/renderer/net/net_error_helper_core_unittest.cc

@@ -114,13 +114,14 @@ std::string NetErrorString(net::Error net_error) {
 class NetErrorHelperCoreTest : public testing::Test,
                                public NetErrorHelperCore::Delegate {
  public:
-  NetErrorHelperCoreTest() : timer_(new base::MockTimer(false, false)),
-                             core_(this),
-                             update_count_(0),
-                             error_html_update_count_(0),
-                             reload_count_(0),
-                             load_stale_count_(0),
-                             enable_page_helper_functions_count_(0) {
+  NetErrorHelperCoreTest()
+      : timer_(new base::MockTimer(false, false)),
+        core_(this),
+        update_count_(0),
+        error_html_update_count_(0),
+        reload_count_(0),
+        load_stale_count_(0),
+        enable_page_helper_functions_count_(0) {
     core_.set_auto_reload_enabled(false);
     core_.set_timer_for_testing(scoped_ptr<base::Timer>(timer_));
   }

chrome/renderer/net/net_error_page_controller.cc

@@ -85,8 +85,7 @@ gin::ObjectTemplateBuilder NetErrorPageController::GetObjectTemplateBuilder(
                  &NetErrorPageController::LoadStaleButtonClick)
       .SetMethod("reloadButtonClick",
                  &NetErrorPageController::ReloadButtonClick)
-      .SetMethod("moreButtonClick",
-                 &NetErrorPageController::MoreButtonClick);
+      .SetMethod("moreButtonClick", &NetErrorPageController::MoreButtonClick);
 }
 
 void NetErrorPageController::OnDestruct() {}

tools/metrics/histograms/histograms.xml

@@ -11651,6 +11651,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="Net.ErrorPageCounts" enum="NetErrorPageEvents">
+  <owner>rdsmith@chromium.org</owner>
+  <owner>ellyjones@chromium.org</owner>
+  <summary>
+    Counts of various events that can occur on the network error page. See the
+    histogram for details.
+  </summary>
+</histogram>
+
 <histogram name="Net.FileError_Flush">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -37479,6 +37488,18 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="806" label="DNS_SORT_ERROR"/>
 </enum>
 
+<enum name="NetErrorPageEvents" type="int">
+  <int value="0" label="Error Page Shown"/>
+  <int value="1" label="Reload Button Shown"/>
+  <int value="2" label="Reload Button Clicked"/>
+  <int value="3" label="Reload Button Click Load Error"/>
+  <int value="4" label="Load Stale Button Shown"/>
+  <int value="5" label="Load Stale Button Clicked"/>
+  <int value="6" label="Load Stale Button Click Load Error"/>
+  <int value="7" label="More Button Clicked"/>
+  <int value="8" label="Browser Initiated Reload"/>
+</enum>
+
 <enum name="NetPreconnectUtilization" type="int">
   <int value="0" label="non-speculative, never connected"/>
   <int value="1" label="non-speculative, never used"/>