Interstitial options are not OR'd properly.

content/public/browser/content_browser_client.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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 111 matching lines @@
 // Embedder API (or SPI) for participating in browser logic, to be implemented
 // by the client of the content browser. See ChromeContentBrowserClient for the
 // principal implementation. The methods are assumed to be called on the UI
 // thread unless otherwise specified. Use this "escape hatch" sparingly, to
 // avoid the embedder interface ballooning and becoming very specific to Chrome.
 // (Often, the call out to the client can happen in a different part of the code
 // that either already has a hook out to the embedder, or calls out to one of
 // the observer interfaces.)
 class CONTENT_EXPORT ContentBrowserClient {
  public:
+  enum AllowCertErrorOptionsMask {

[Charlie Reis, 2014/09/19 20:00:12]

This should probably be in its own file in content/public/browser, since both
content/ and chrome/ code depend on it.

+    OVERRIDABLE = 1 << 0,

[Charlie Reis, 2014/09/19 20:00:12]

From the Content API guidelines:
"enum values should start with the name of the type, i.e. PAGE_TRANSITION_LINK
in the content::PageTransition enum"
http://www.chromium.org/developers/content-module/content-api

(We may want a better enum name in that case, like SSLCertErrorOptions?)

+    STRICT_ENFORCEMENT = 1 << 1,
+    EXPIRED_PREVIOUS_DECISION = 1 << 2
+  };
+
   virtual ~ContentBrowserClient() {}
 
   // Allows the embedder to set any number of custom BrowserMainParts
   // implementations for the browser startup code. See comments in
   // browser_main_parts.h.
   virtual BrowserMainParts* CreateBrowserMainParts(
       const MainFunctionParams& parameters);
 
   // If content creates the WebContentsView implementation, it will ask the
   // embedder to return an (optional) delegate to customize it. The view will
@@ skipping 222 matching lines @@
       BrowserContext* browser_context,
       const GURL& site,
       bool can_be_default,
       std::string* partition_domain,
       std::string* partition_name,
       bool* in_memory);
 
   // Create and return a new quota permission context.
   virtual QuotaPermissionContext* CreateQuotaPermissionContext();
 
-  // Informs the embedder that a certificate error has occured.  If
-  // |overridable| is true and if |strict_enforcement| is false, the user
-  // can ignore the error and continue. The embedder can call the callback
+  // Informs the embedder that a certificate error has occured. |options_mask|
+  // must be a bitwise OR of AllowCertErrorOptionsMask values. If |options_mask|
+  // contains OVERRIDABLE and does not contain STRICT_ENFORCEMENT, the user can
+  // ignore the error and continue. The embedder can call the callback
   // asynchronously. If |result| is not set to
-  // CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE, the request will be cancelled
-  // or denied immediately, and the callback won't be run.
+  // CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE, the request will be cancelled or
+  // denied immediately, and the callback won't be run.
   virtual void AllowCertificateError(int render_process_id,
                                      int render_frame_id,
                                      int cert_error,
                                      const net::SSLInfo& ssl_info,
                                      const GURL& request_url,
                                      ResourceType resource_type,
-                                     bool overridable,
-                                     bool strict_enforcement,
-                                     bool expired_previous_decision,
+                                     int options_mask,
                                      const base::Callback<void(bool)>& callback,
                                      CertificateRequestResultType* result) {}
 
   // Selects a SSL client certificate and returns it to the |callback|. If no
   // certificate was selected NULL is returned to the |callback|.
   virtual void SelectClientCertificate(
       int render_process_id,
       int render_frame_id,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
@@ skipping 244 matching lines @@
 // camera. Note that this does not query the user. |type| must be
 // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE.
 virtual bool CheckMediaAccessPermission(BrowserContext* browser_context,
                                         const GURL& security_origin,
                                         MediaStreamType type);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_