Split captive portal metrics out of SSLErrorClassification

chrome/browser/interstitials/chrome_metrics_helper.h

Index: chrome/browser/interstitials/chrome_metrics_helper.h
diff --git a/chrome/browser/interstitials/chrome_metrics_helper.h b/chrome/browser/interstitials/chrome_metrics_helper.h
index e56e59afb8f4d641ce58228cd13653cf78d3abe3..c3fa3d4c11ba305be2ba9d1dc3121b9fdc0a2a78 100644
--- a/chrome/browser/interstitials/chrome_metrics_helper.h
+++ b/chrome/browser/interstitials/chrome_metrics_helper.h
@@ -18,9 +18,13 @@ namespace extensions {
 class ExperienceSamplingEvent;
 }
 
+class CaptivePortalMetricsHelper;
+
 // This class adds desktop-Chrome-specific metrics (extension experience
 // sampling) to the security_interstitials::MetricsHelper. Together, they
 // record UMA, Rappor, and experience sampling metrics.
+
+// This class is meant to be used on the UI thread for captive portal metrics.

[estark, 2015/09/25 23:53:34]

nit: at a glance this reads like this class's main purpose is for captive portal
metrics. Maybe "This class must be used on the UI thread because of the captive
portal metrics"?

 class ChromeMetricsHelper : public security_interstitials::MetricsHelper {
  public:
   ChromeMetricsHelper(
@@ -30,12 +34,15 @@ class ChromeMetricsHelper : public security_interstitials::MetricsHelper {
       const std::string& sampling_event_name);
   ~ChromeMetricsHelper() override;
 
+  void StartRecordingCaptivePortalMetrics(bool overridable);
+
  protected:
   // security_interstitials::MetricsHelper methods:
   void RecordExtraUserDecisionMetrics(
       security_interstitials::MetricsHelper::Decision decision) override;
   void RecordExtraUserInteractionMetrics(
       security_interstitials::MetricsHelper::Interaction interaction) override;
+  void RecordExtraShutdownMetrics() override;
 
  private:
   content::WebContents* web_contents_;
@@ -44,6 +51,7 @@ class ChromeMetricsHelper : public security_interstitials::MetricsHelper {
 #if defined(ENABLE_EXTENSIONS)
   scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
 #endif
+  scoped_ptr<CaptivePortalMetricsHelper> captive_portal_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMetricsHelper);
 };