Forget SSL error exceptions when good certs seen for regular requests.

content/browser/ssl/ssl_policy.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 "content/browser/ssl/ssl_policy.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
+#include "base/metrics/histogram.h"

[Mark P, 2015/04/17 16:20:36]

histogram_macros is more appropriate

[jww, 2015/04/17 18:14:33]

Done.

 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/ssl/ssl_request_info.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 77 matching lines @@
     return;
 
   SiteInstance* site_instance = entry->site_instance();
   if (!site_instance)
       return;
 
   backend_->HostRanInsecureContent(GURL(security_origin).host(),
                                    site_instance->GetProcess()->GetID());
 }
 
+enum SSLGoodCertSeenEvent {

[Mark P, 2015/04/17 16:20:36]

1. This is an odd place for this enum.  This is style-acceptable?
2. Please put the useful standard warning label about enums that a recorded in
UMA (don't deleted or reorder or renumber; add new entry only at end)
3. Please explicitly do =0, =1, etc.

[jww, 2015/04/17 18:14:33]

You're right, it probably should be at the top in an anonymous namespace. Done.
Done.
Done.

+  NO_PREVIOUS_EXCEPTION,
+  HAD_PREVIOUS_EXCEPTION,
+  END_OF_SSL_GOOD_CERT_SEEN_EVENT
+};
+
 void SSLPolicy::OnRequestStarted(SSLRequestInfo* info) {
   // TODO(abarth): This mechanism is wrong.  What we should be doing is sending
   // this information back through WebKit and out some FrameLoaderClient
   // methods.
 
-  if (net::IsCertStatusError(info->ssl_cert_status()))
+  if (net::IsCertStatusError(info->ssl_cert_status())) {
     backend_->HostRanInsecureContent(info->url().host(), info->child_id());
+  } else {
+    SSLGoodCertSeenEvent event = NO_PREVIOUS_EXCEPTION;
+    if (backend_->HasAllowException(info->url().host()))
+      event = HAD_PREVIOUS_EXCEPTION;
+    UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.good_cert_seen", event,

[Mark P, 2015/04/17 16:20:36]

This sounds more like a BOOLEAN histogram.  Why are you using an enum here?  Do
you have the expectation that it needs to expand in the future?  If so, how?

[jww, 2015/04/17 18:14:33]

In the past, when I've had boolean uma measurements, I've been asked to make an
enum anyway for clarity in the reporting (see SSLCertificateDecisionsDidRevoke
for example:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...).

Personally, I like that approach as well, but if you feel strongly that it
should be a straight boolean instead, let me know.

[Mark P, 2015/04/17 20:26:19]

Acknowledged.

+                              END_OF_SSL_GOOD_CERT_SEEN_EVENT);
+
+    // If there's no certificate error, a good certificate has been seen, so
+    // clear out any exceptions that were made by the user for bad certificates.
+    backend_->RevokeUserAllowExceptions(info->url().host());
+  }
 }
 
 void SSLPolicy::UpdateEntry(NavigationEntryImpl* entry,
                             WebContentsImpl* web_contents) {
   DCHECK(entry);
 
   InitializeEntryIfNeeded(entry);
 
   if (!entry->GetURL().SchemeIsSecure())
     return;
@@ skipping 107 matching lines @@
       SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED;
 }
 
 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) {
   GURL parsed_origin(origin);
   if (parsed_origin.SchemeIsSecure())
     backend_->HostRanInsecureContent(parsed_origin.host(), pid);
 }
 
 }  // namespace content