Add additional UMA stats for remembering certificate decisions.

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 009fdf9651e886654824aaca6152196c0398a9f1..4f8844fc025b39dce11ef0ff0546ed5840063dfc 100644
--- a/chrome/browser/ssl/ssl_blocking_page.h
+++ b/chrome/browser/ssl/ssl_blocking_page.h
@@ -56,14 +56,14 @@ class SSLBlockingPage : public content::InterstitialPageDelegate,
   // Creates an SSL blocking page. If the blocking page isn't shown, the caller
   // is responsible for cleaning up the blocking page, otherwise the
   // interstitial takes ownership when shown.
-  SSLBlockingPage(
-      content::WebContents* web_contents,
-      int cert_error,
-      const net::SSLInfo& ssl_info,
-      const GURL& request_url,
-      bool overridable,
-      bool strict_enforcement,
-      const base::Callback<void(bool)>& callback);
+  SSLBlockingPage(content::WebContents* web_contents,
+                  int cert_error,
+                  const net::SSLInfo& ssl_info,
+                  const GURL& request_url,
+                  bool overridable,

[sky, 2014/08/12 16:47:31]

A bitmask would make this code more readable.

[felt, 2014/08/12 16:50:28]

Do you mean condense overridable, strict_enforcement, and
expired_but_previously_allowed into a bitmask? They're held in separate member
variables so I'm not sure how much we'd gain from that?

[jww, 2014/08/12 19:23:42]

I think sky is suggesting that call sites will be more readable. I'll give it a
whirl.

+                  bool strict_enforcement,
+                  bool expired_but_previously_allowed,
+                  const base::Callback<void(bool)>& callback);
 
   // A method that sets strings in the specified dictionary from the passed
   // vector so that they can be used to resource the ssl_roadblock.html/
@@ -120,6 +120,9 @@ class SSLBlockingPage : public content::InterstitialPageDelegate,
   bool captive_portal_no_response_;
   // Was a captive portal detected?
   bool captive_portal_detected_;
+  // Did the user previously allow a bad certificate but the decision has now
+  // expired?
+  bool expired_but_previously_allowed_;

[sky, 2014/08/12 16:47:31]

const? Probably on all similar members.

[jww, 2014/08/12 19:23:42]

Done.

 
   content::NotificationRegistrar registrar_;