Add Rappor metrics for Safe Browsing and SSL interstitials.

chrome/browser/interstitials/security_interstitial_uma_helper.cc

Index: chrome/browser/interstitials/security_interstitial_uma_helper.cc
diff --git a/chrome/browser/interstitials/security_interstitial_uma_helper.cc b/chrome/browser/interstitials/security_interstitial_uma_helper.cc
deleted file mode 100644
index aade7ff796f99560eac7d2bc1e126bfab6720f75..0000000000000000000000000000000000000000
--- a/chrome/browser/interstitials/security_interstitial_uma_helper.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) 2014 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.
-
-#include "chrome/browser/interstitials/security_interstitial_uma_helper.h"
-
-#include "base/metrics/histogram.h"
-#include "chrome/browser/history/history_service.h"
-#include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/webdata/web_data_service_factory.h"
-#include "content/public/browser/web_contents.h"
-
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
-#endif
-
-SecurityInterstitialUmaHelper::SecurityInterstitialUmaHelper(
-    content::WebContents* web_contents,
-    const GURL& request_url,
-    const std::string& histogram_prefix,
-    const std::string& sampling_event_name)
-    : web_contents_(web_contents),
-      request_url_(request_url),
-      histogram_prefix_(histogram_prefix),
-      sampling_event_name_(sampling_event_name),
-      num_visits_(-1) {
-  HistoryService* history_service = HistoryServiceFactory::GetForProfile(
-      Profile::FromBrowserContext(web_contents->GetBrowserContext()),
-      ServiceAccessType::EXPLICIT_ACCESS);
-  if (history_service) {
-    history_service->GetVisibleVisitCountToHost(
-        request_url_,
-        base::Bind(&SecurityInterstitialUmaHelper::OnGotHistoryCount,
-                   base::Unretained(this)),
-        &request_tracker_);
-  }
-}
-
-SecurityInterstitialUmaHelper::~SecurityInterstitialUmaHelper() {
-}
-
-// Directly adds to the histograms, using the same properties as
-// UMA_HISTOGRAM_ENUMERATION, because the macro doesn't allow non-constant
-// histogram names.
-void SecurityInterstitialUmaHelper::RecordUserDecision(
-    SecurityInterstitialDecision decision) {
-  std::string decision_histogram_name(
-      "interstitial." + histogram_prefix_ + ".decision");
-  base::HistogramBase* decision_histogram = base::LinearHistogram::FactoryGet(
-      decision_histogram_name, 1, MAX_DECISION, MAX_DECISION + 1,
-      base::HistogramBase::kUmaTargetedHistogramFlag);
-  decision_histogram->Add(decision);
-
-#if defined(ENABLE_EXTENSIONS)
-  if (!sampling_event_.get()) {
-    sampling_event_.reset(new extensions::ExperienceSamplingEvent(
-        sampling_event_name_,
-        request_url_,
-        web_contents_->GetLastCommittedURL(),
-        web_contents_->GetBrowserContext()));
-  }
-  switch (decision) {
-    case PROCEED:
-      sampling_event_->CreateUserDecisionEvent(
-          extensions::ExperienceSamplingEvent::kProceed);
-      break;
-    case DONT_PROCEED:
-      sampling_event_->CreateUserDecisionEvent(
-          extensions::ExperienceSamplingEvent::kDeny);
-      break;
-    case SHOW:
-    case PROCEEDING_DISABLED:
-    case MAX_DECISION:
-      break;
-  }
-#endif
-
-  // Record additional information about sites that users have
-  // visited before.
-  if (num_visits_ < 1 || (decision != PROCEED && decision != DONT_PROCEED))
-    return;
-  std::string history_histogram_name(
-      "interstitial." + histogram_prefix_ + ".decision.repeat_visit");
-  base::HistogramBase* history_histogram = base::LinearHistogram::FactoryGet(
-      history_histogram_name, 1, MAX_DECISION, MAX_DECISION + 1,
-      base::HistogramBase::kUmaTargetedHistogramFlag);
-  history_histogram->Add(SHOW);
-  history_histogram->Add(decision);
-}
-
-void SecurityInterstitialUmaHelper::RecordUserInteraction(
-    SecurityInterstitialInteraction interaction) {
-  std::string interaction_histogram_name(
-      "interstitial." + histogram_prefix_ + ".interaction");
-  base::HistogramBase* interaction_histogram =
-      base::LinearHistogram::FactoryGet(
-          interaction_histogram_name, 1, MAX_INTERACTION, MAX_INTERACTION + 1,
-          base::HistogramBase::kUmaTargetedHistogramFlag);
-  interaction_histogram->Add(interaction);
-
-#if defined(ENABLE_EXTENSIONS)
-  if (!sampling_event_.get()) {
-    sampling_event_.reset(new extensions::ExperienceSamplingEvent(
-        sampling_event_name_,
-        request_url_,
-        web_contents_->GetLastCommittedURL(),
-        web_contents_->GetBrowserContext()));
-  }
-  switch (interaction) {
-    case SHOW_LEARN_MORE:
-      sampling_event_->set_has_viewed_learn_more(true);
-      break;
-    case SHOW_ADVANCED:
-      sampling_event_->set_has_viewed_details(true);
-      break;
-    case SHOW_PRIVACY_POLICY:
-    case SHOW_DIAGNOSTIC:
-    case RELOAD:
-    case OPEN_TIME_SETTINGS:
-    case TOTAL_VISITS:
-    case MAX_INTERACTION:
-      break;
-  }
-#endif
-}
-
-void SecurityInterstitialUmaHelper::OnGotHistoryCount(
-    bool success,
-    int num_visits,
-    base::Time first_visit) {
-  if (success)
-    num_visits_ = num_visits;
-}