Add Rappor metrics for Safe Browsing and SSL interstitials.

chrome/browser/ssl/ssl_blocking_page.h

Index: chrome/browser/ssl/ssl_blocking_page.h
diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h
index 1a6b3da1c924764fd4165f32dc4590378928939b..dac5ab41a2f8050a7f99685cf017b820cde0716b 100644
--- a/chrome/browser/ssl/ssl_blocking_page.h
+++ b/chrome/browser/ssl/ssl_blocking_page.h
@@ -12,8 +12,8 @@
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
+#include "chrome/browser/interstitials/security_interstitial_metrics_helper.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"
 
@@ -95,7 +95,7 @@ class SSLBlockingPage : public SecurityInterstitialPage {
   void NotifyDenyCertificate();
   void NotifyAllowCertificate();
 
-  std::string GetHistogramPrefix() const;
+  std::string GetUmaHistogramPrefix() const;
   std::string GetSamplingEventName() const;
 
   base::Callback<void(bool)> callback_;
@@ -117,9 +117,9 @@ class SSLBlockingPage : public SecurityInterstitialPage {
   // expired?
   const bool expired_but_previously_allowed_;
   scoped_ptr<SSLErrorClassification> ssl_error_classification_;
-  scoped_ptr<SecurityInterstitialUmaHelper> uma_helper_;
+  scoped_ptr<SecurityInterstitialMetricsHelper> metrics_helper_;
 
-  // Which type of Safe Browsing interstitial this is.
+  // Which type of interstitial this is.
   enum SSLInterstitialReason {
     SSL_REASON_SSL,
     SSL_REASON_BAD_CLOCK