Add UMA histogram to count hard revokes of user certificate error decisions.

chrome/browser/ui/website_settings/website_settings.cc

 // 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.
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #endif
 
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 using content::BrowserThread;
 
 namespace {
 
+// Events for UMA. Do not reorder or change!
+enum SSLCertificateDecisionsDidRevoke {
+  USER_CERT_DECISIONS_NOT_REVOKED = 0,
+  USER_CERT_DECISIONS_REVOKED,
+  END_OF_SSL_CERTIFICATE_DECISIONS_DID_REVOKE_ENUM
+};
+
 // The list of content settings types to display on the Website Settings UI.
 ContentSettingsType kPermissionType[] = {
   CONTENT_SETTINGS_TYPE_IMAGES,
   CONTENT_SETTINGS_TYPE_JAVASCRIPT,
   CONTENT_SETTINGS_TYPE_PLUGINS,
   CONTENT_SETTINGS_TYPE_POPUPS,
   CONTENT_SETTINGS_TYPE_GEOLOCATION,
   CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
   CONTENT_SETTINGS_TYPE_FULLSCREEN,
   CONTENT_SETTINGS_TYPE_MOUSELOCK,
@@ skipping 93 matching lines @@
       ui_(ui),
       infobar_service_(infobar_service),
       show_info_bar_(false),
       site_url_(url),
       site_identity_status_(SITE_IDENTITY_STATUS_UNKNOWN),
       cert_id_(0),
       site_connection_status_(SITE_CONNECTION_STATUS_UNKNOWN),
       cert_store_(cert_store),
       content_settings_(profile->GetHostContentSettingsMap()),
       chrome_ssl_host_state_delegate_(
-          ChromeSSLHostStateDelegateFactory::GetForProfile(profile)) {
+          ChromeSSLHostStateDelegateFactory::GetForProfile(profile)),
+      did_revoke_user_ssl_decisions_(false) {
   Init(profile, url, ssl);
 
   HistoryService* history_service = HistoryServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   if (history_service) {
     history_service->GetVisibleVisitCountToHost(
         site_url_,
         base::Bind(&WebsiteSettings::OnGotVisitCountToHost,
                    base::Unretained(this)),
         &visit_count_task_tracker_);
@@ skipping 126 matching lines @@
   PresentHistoryInfo(first_visit);
 }
 
 void WebsiteSettings::OnSiteDataAccessed() {
   PresentSiteData();
 }
 
 void WebsiteSettings::OnUIClosing() {
   if (show_info_bar_)
     WebsiteSettingsInfoBarDelegate::Create(infobar_service_);
+
+  SSLCertificateDecisionsDidRevoke user_decision =
+      did_revoke_user_ssl_decisions_ ? USER_CERT_DECISIONS_REVOKED
+                                     : USER_CERT_DECISIONS_NOT_REVOKED;

[Peter Kasting, 2014/08/22 22:44:00]

Nit: clang-format error; wrap like:

      did_revoke_user_ssl_decisions_ ?
          USER_CERT_DECISIONS_REVOKED : USER_CERT_DECISIONS_NOT_REVOKED;

[jww, 2014/08/22 22:56:39]

I'm going to push back on this. This instance was not a clang-format decision;
this matches what is done throughout the rest of this file (see lines 108 - 119,
for example).

[Peter Kasting, 2014/08/22 23:02:22]

It's a nit, so you can override me.  And being consistent with the file is a
fine reason too.  Historically, this style never existed in Chromium until
clang-format introduced it, and despite some discussions that I thought ended
with someone agreeing to fix clang-format not to do it, it still seems to crop
up frequently, so I do my best to prevent it spreading.

+
+  UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.did_user_revoke_decisions",
+                            user_decision,
+                            END_OF_SSL_CERTIFICATE_DECISIONS_DID_REVOKE_ENUM);
+}
+
+void WebsiteSettings::OnSSLDecisionsRevokeButtonPressed() {
+  DCHECK(chrome_ssl_host_state_delegate_);
+  chrome_ssl_host_state_delegate_->RevokeUserDecisionsHard(site_url().host());
+  did_revoke_user_ssl_decisions_ = true;
 }
 
 void WebsiteSettings::Init(Profile* profile,
                            const GURL& url,
                            const content::SSLStatus& ssl) {
   if (url.SchemeIs(content::kChromeUIScheme)) {
     site_identity_status_ = SITE_IDENTITY_STATUS_INTERNAL_PAGE;
     site_identity_details_ =
         l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE);
     site_connection_status_ = SITE_CONNECTION_STATUS_INTERNAL_PAGE;
@@ skipping 394 matching lines @@
   if (visited_before_today) {
     first_visit_text = l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
         base::TimeFormatShortDate(first_visit));
   } else {
     first_visit_text = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
   }
   ui_->SetFirstVisit(first_visit_text);
 }