Remove redundancy in security interstitial UMA logic

chrome/browser/safe_browsing/safe_browsing_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.
 //
 // Classes for managing the SafeBrowsing interstitial pages.
 //
 // When a user is about to visit a page the SafeBrowsing system has deemed to
 // be malicious, either as malware or a phishing page, we show an interstitial
 // page with some options (go back, continue) to give the user a chance to avoid
 // the harmful page.
@@ skipping 16 matching lines @@
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.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 "chrome/browser/safe_browsing/ui_manager.h"
 #include "url/gurl.h"
 
 class MalwareDetails;
 class SafeBrowsingBlockingPageFactory;
 
 namespace base {
 class MessageLoop;
 }
 
-#if defined(ENABLE_EXTENSIONS)
-namespace extensions {
-class ExperienceSamplingEvent;
-}
-#endif
-
 class SafeBrowsingBlockingPage : public SecurityInterstitialPage {
  public:
   typedef SafeBrowsingUIManager::UnsafeResource UnsafeResource;
   typedef std::vector<UnsafeResource> UnsafeResourceList;
   typedef std::map<content::WebContents*, UnsafeResourceList> UnsafeResourceMap;
 
   // Interstitial type, used in tests.
   static const void* kTypeForTesting;
 
   ~SafeBrowsingBlockingPage() override;
@@ skipping 49 matching lines @@
   // report but clicked "proceed anyway", we delay the call to
   // MalwareDetails::FinishCollection() by this much time (in
   // milliseconds), in order to get data from the blocked resource itself.
   int64 malware_details_proceed_delay_ms_;
 
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
       MalwareReportsTransitionDisabled);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
       MalwareReportsToggling);
 
-  // These enums are used for histograms.  Don't reorder, delete, or insert
-  // elements.  New elements should be added before MAX_ACTION only.
-  enum Decision {
-    SHOW,
-    PROCEED,
-    DONT_PROCEED,
-    PROCEEDING_DISABLED,
-    MAX_DECISION
-  };
-  enum Interaction {
-    TOTAL_VISITS,
-    SHOW_ADVANCED,
-    SHOW_PRIVACY_POLICY,
-    SHOW_DIAGNOSTIC,
-    SHOW_LEARN_MORE,
-    MAX_INTERACTION
-  };
-
-  // Record a user decision or interaction to the appropriate UMA histogram.
-  void RecordUserDecision(Decision decision);
-  void RecordUserInteraction(Interaction interaction);
-
-  // 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);
-
   // Checks if we should even show the malware details option. For example, we
   // don't show it in incognito mode.
   bool CanShowMalwareDetailsOption();
 
   // Called when the insterstitial is going away. If there is a
   // pending malware details object, we look at the user's
   // preferences, and if the option to send malware details is
   // enabled, the report is scheduled to be sent on the |ui_manager_|.
   void FinishMalwareDetails(int64 delay_ms);
 
@@ skipping 36 matching lines @@
   // The list of unsafe resources this page is warning about.
   UnsafeResourceList unsafe_resources_;
 
   // A MalwareDetails object that we start generating when the
   // blocking page is shown. The object will be sent when the warning
   // is gone (if the user enables the feature).
   scoped_refptr<MalwareDetails> malware_details_;
 
   bool proceeded_;
 
-  // Which type of interstitial this is.
-  enum {
-    TYPE_MALWARE,
-    TYPE_HARMFUL,
-    TYPE_PHISHING,
-  } interstitial_type_;
+  // Which type of Safe Browsing interstitial this is.
+  enum SBInterstitialReason {
+    SB_REASON_MALWARE,
+    SB_REASON_HARMFUL,
+    SB_REASON_PHISHING,
+  } interstitial_reason_;
 
   // The factory used to instantiate SafeBrowsingBlockingPage objects.
   // Usefull for tests, so they can provide their own implementation of
   // SafeBrowsingBlockingPage.
   static SafeBrowsingBlockingPageFactory* factory_;
 
-  // How many times is this same URL in history? Used for histogramming.
-  int num_visits_;
-  base::CancelableTaskTracker request_tracker_;
-
  private:
   // Fills the passed dictionary with the values to be passed to the template
   // when creating the HTML.
   void PopulateExtendedReportingOption(base::DictionaryValue* load_time_data);
   void PopulateMalwareLoadTimeData(base::DictionaryValue* load_time_data);
   void PopulateHarmfulLoadTimeData(base::DictionaryValue* load_time_data);
   void PopulatePhishingLoadTimeData(base::DictionaryValue* load_time_data);
 
-#if defined(ENABLE_EXTENSIONS)
-  scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
-#endif
+  std::string GetHistogramPrefix() const;
+  std::string GetSamplingEventName() const;
+
+  scoped_ptr<SecurityInterstitialUmaHelper> uma_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPage);
 };
 
 // Factory for creating SafeBrowsingBlockingPage.  Useful for tests.
 class SafeBrowsingBlockingPageFactory {
  public:
   virtual ~SafeBrowsingBlockingPageFactory() { }
 
   virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
       SafeBrowsingUIManager* ui_manager,
       content::WebContents* web_contents,
       const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) = 0;
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_