| Index: content/public/browser/ssl_status.h
|
| diff --git a/content/public/browser/ssl_status.h b/content/public/browser/ssl_status.h
|
| index 6e28e628af4256c17bea954a340a7ad0745de87b..5de89762eba416825710ee67be0ae2d00557d0ed 100644
|
| --- a/content/public/browser/ssl_status.h
|
| +++ b/content/public/browser/ssl_status.h
|
| @@ -10,7 +10,6 @@
|
| #include <vector>
|
|
|
| #include "content/common/content_export.h"
|
| -#include "content/public/common/security_style.h"
|
| #include "net/cert/cert_status_flags.h"
|
| #include "net/cert/sct_status_flags.h"
|
| #include "net/cert/x509_certificate.h"
|
| @@ -56,17 +55,16 @@ struct CONTENT_EXPORT SSLStatus {
|
| };
|
|
|
| SSLStatus();
|
| - SSLStatus(SecurityStyle security_style,
|
| - scoped_refptr<net::X509Certificate> certificate,
|
| + SSLStatus(scoped_refptr<net::X509Certificate> certificate,
|
| const net::SSLInfo& ssl_info);
|
| SSLStatus(const SSLStatus& other);
|
| ~SSLStatus();
|
|
|
| bool Equals(const SSLStatus& status) const {
|
| - return security_style == status.security_style &&
|
| + return initialized == status.initialized &&
|
| !!certificate == !!status.certificate &&
|
| - (certificate ? certificate->Equals(status.certificate.get()) :
|
| - true) &&
|
| + (certificate ? certificate->Equals(status.certificate.get())
|
| + : true) &&
|
| cert_status == status.cert_status &&
|
| security_bits == status.security_bits &&
|
| key_exchange_group == status.key_exchange_group &&
|
| @@ -76,7 +74,7 @@ struct CONTENT_EXPORT SSLStatus {
|
| pkp_bypassed == status.pkp_bypassed;
|
| }
|
|
|
| - content::SecurityStyle security_style;
|
| + bool initialized;
|
| scoped_refptr<net::X509Certificate> certificate;
|
| net::CertStatus cert_status;
|
| int security_bits;
|
|
|