Interstitial options are not OR'd properly.

content/browser/ssl/ssl_policy.cc

Index: content/browser/ssl/ssl_policy.cc
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 51ae7b2a1c800cdcf7e648869783d60277a08381..8d8c6da2e632f6b150d6850efecae2f6457445fc 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -57,11 +57,11 @@ void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) {
     case net::ERR_CERT_WEAK_KEY:
     case net::ERR_CERT_NAME_CONSTRAINT_VIOLATION:
       if (!handler->fatal())
-        options_mask |= OVERRIDABLE;
+        options_mask |= ContentBrowserClient::OVERRIDABLE;
       else
-        options_mask |= STRICT_ENFORCEMENT;
+        options_mask |= ContentBrowserClient::STRICT_ENFORCEMENT;
       if (expired_previous_decision)
-        options_mask |= EXPIRED_PREVIOUS_DECISION;
+        options_mask |= ContentBrowserClient::EXPIRED_PREVIOUS_DECISION;
       OnCertErrorInternal(handler, options_mask);
       break;
     case net::ERR_CERT_NO_REVOCATION_MECHANISM:
@@ -79,9 +79,9 @@ void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) {
     case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
     case net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN:
       if (handler->fatal())
-        options_mask |= STRICT_ENFORCEMENT;
+        options_mask |= ContentBrowserClient::STRICT_ENFORCEMENT;
       if (expired_previous_decision)
-        options_mask |= EXPIRED_PREVIOUS_DECISION;
+        options_mask |= ContentBrowserClient::EXPIRED_PREVIOUS_DECISION;
       OnCertErrorInternal(handler, options_mask);
       break;
     default:
@@ -189,10 +189,6 @@ void SSLPolicy::OnAllowCertificate(scoped_refptr<SSLCertErrorHandler> handler,
 
 void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
                                     int options_mask) {
-  bool overridable = (options_mask & OVERRIDABLE) != 0;
-  bool strict_enforcement = (options_mask & STRICT_ENFORCEMENT) != 0;
-  bool expired_previous_decision =
-      (options_mask & EXPIRED_PREVIOUS_DECISION) != 0;
   CertificateRequestResultType result =
       CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE;
   GetContentClient()->browser()->AllowCertificateError(
@@ -202,9 +198,7 @@ void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
       handler->ssl_info(),
       handler->request_url(),
       handler->resource_type(),
-      overridable,
-      strict_enforcement,
-      expired_previous_decision,
+      options_mask,
       base::Bind(&SSLPolicy::OnAllowCertificate,
                  base::Unretained(this),
                  make_scoped_refptr(handler)),