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 36 matching lines @@
   // DO NOT reorder or change these without also changing the JavaScript!
   enum SSLBlockingPageCommands {
     CMD_DONT_PROCEED = 0,
     CMD_PROCEED = 1,
     CMD_MORE = 2,
     CMD_RELOAD = 3,
     CMD_HELP = 4,
     CMD_CLOCK = 5
   };
 
+  enum SSLBlockingPageOptionsMask {
+    OVERRIDABLE = 1 << 0,
+    STRICT_ENFORCEMENT = 1 << 1,
+    EXPIRED_BUT_PREVIOUSLY_ALLOWED = 1 << 2
+  };
+
   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);
+  // interstitial takes ownership when shown. |options_mask| must be a bitwise
+  // mask of SSLBlockingPageOptionsMask values.
+  SSLBlockingPage(content::WebContents* web_contents,
+                  int cert_error,
+                  const net::SSLInfo& ssl_info,
+                  const GURL& request_url,
+                  int options_mask,
+                  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 14 matching lines @@
 
   // content::NotificationObserver:
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
       const content::NotificationDetails& details) OVERRIDE;
 
   base::Callback<void(bool)> callback_;
 
   content::WebContents* web_contents_;
-  int cert_error_;
+  const int cert_error_;
   const net::SSLInfo ssl_info_;
-  GURL request_url_;
+  const GURL request_url_;
   // Could the user successfully override the error?
   // overridable_ will be set to false if strict_enforcement_ is true.
-  bool overridable_;
+  const bool overridable_;
   // Has the site requested strict enforcement of certificate errors?
-  bool strict_enforcement_;
+  const bool strict_enforcement_;
   content::InterstitialPage* interstitial_page_;  // Owns us.
   // Is the hostname for an internal network?
   bool internal_;
   // How many times is this same URL in history?
   int num_visits_;
   // 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?
+  const bool expired_but_previously_allowed_;
 
   // For the FieldTrial: this contains the name of the condition.
   std::string trial_condition_;
 
 #if defined(ENABLE_EXTENSIONS)
   // For Chrome Experience Sampling Platform: this maintains event state.
   scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
 #endif
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_