Add additional UMA stats for remembering certificate decisions.

chrome/browser/ssl/ssl_blocking_page.h

 // 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.
 
 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
   };
 
   virtual ~SSLBlockingPage();
 
   // Create an interstitial and show it.
   void Show();
 
   // 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/
   // ssl_error.html files.
   // Note: there can be up to 5 strings in |extra_info|.
   static void SetExtraInfo(base::DictionaryValue* strings,
                            const std::vector<base::string16>& extra_info);
 
  protected:
   // InterstitialPageDelegate implementation.
@@ skipping 36 matching lines @@
   // Used for getting num_visits_.
   base::CancelableTaskTracker request_tracker_;
   // Is captive portal detection enabled?
   bool captive_portal_detection_enabled_;
   // Did the probe complete before the interstitial was closed?
   bool captive_portal_probe_completed_;
   // Did the captive portal probe receive an error or get a non-HTTP response?
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_