Remove redundancy in security interstitial UMA logic

chrome/browser/ssl/ssl_blocking_page.h

 // Copyright (c) 2012 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_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
-#include "chrome/browser/history/history_service.h"
 #include "chrome/browser/interstitials/security_interstitial_page.h"
+#include "chrome/browser/interstitials/security_interstitial_uma_helper.h"
 #include "net/ssl/ssl_info.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_EXTENSIONS)
 namespace extensions {
 class ExperienceSamplingEvent;
 }
 #endif
 
 class SSLErrorClassification;
@@ skipping 41 matching lines @@
   SSLBlockingPage(content::WebContents* web_contents,
                   int cert_error,
                   const net::SSLInfo& ssl_info,
                   const GURL& request_url,
                   int options_mask,
                   const base::Callback<void(bool)>& callback);
 
   // SecurityInterstitialPage method:
   const void* GetTypeForTesting() const override;
 
-  // A method that sets strings in the specified dictionary from the passed
-  // vector so that they can be used to resource the ssl_roadblock.html/
-  // ssl_error.html files.
-  // Note: there can be up to 5 strings in |extra_info|.
-  static void SetExtraInfo(base::DictionaryValue* strings,
-                           const std::vector<base::string16>& extra_info);
-
   // Returns true if |options_mask| refers to an overridable SSL error.
   static bool IsOptionsOverridable(int options_mask);
 
  protected:
   // InterstitialPageDelegate implementation.
   void CommandReceived(const std::string& command) override;
   void OverrideEntry(content::NavigationEntry* entry) override;
   void OverrideRendererPrefs(content::RendererPreferences* prefs) override;
   void OnProceed() override;
   void OnDontProceed() override;
 
   // SecurityInterstitialPage implementation:
   bool ShouldCreateNewNavigation() const override;
   void PopulateInterstitialStrings(
       base::DictionaryValue* load_time_data) override;
 
  private:
   void NotifyDenyCertificate();
   void NotifyAllowCertificate();
 
-  // Used to query the HistoryService to see if the URL is in history. For UMA.
-  void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit);
+  std::string GetHistogramPrefix() const;
+  std::string GetSamplingEventName() const;
 
   base::Callback<void(bool)> callback_;
 
   const int cert_error_;
   const net::SSLInfo ssl_info_;
   // There are two ways for the user to override an interstitial:
   //
   // overridable_) By clicking on "Advanced" and then "Proceed".
   //   - This corresponds to "the user can override using the UI".
   // danger_overridable_) By typing the word "danger".
   //   - This is an undocumented workaround.
   //   - This can be set to "false" dynamically to prevent the behaviour.
   const bool overridable_;
   bool danger_overridable_;
   // Has the site requested strict enforcement of certificate errors?
   const bool strict_enforcement_;
-  // Is the hostname for an internal network?
-  bool internal_;
-  // How many times is this same URL in history?
-  int num_visits_;
-  // Used for getting num_visits_.
-  base::CancelableTaskTracker request_tracker_;
   // Did the user previously allow a bad certificate but the decision has now
   // expired?
   const bool expired_but_previously_allowed_;
   scoped_ptr<SSLErrorClassification> ssl_error_classification_;
+  scoped_ptr<SecurityInterstitialUmaHelper> uma_helper_;
 
-#if defined(ENABLE_EXTENSIONS)
-  // For Chrome Experience Sampling Platform: this maintains event state.
-  scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
-#endif
+  // Which type of Safe Browsing interstitial this is.
+  enum SSLInterstitialReason {
+    SSL_REASON_SSL,
+    SSL_REASON_BAD_CLOCK
+  } interstitial_reason_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_