| Index: content/browser/ssl/ssl_manager.h
|
| ===================================================================
|
| --- content/browser/ssl/ssl_manager.h (revision 102324)
|
| +++ content/browser/ssl/ssl_manager.h (working copy)
|
| @@ -15,7 +15,6 @@
|
| #include "content/common/notification_observer.h"
|
| #include "content/common/notification_registrar.h"
|
| #include "googleurl/src/gurl.h"
|
| -#include "net/base/cert_status_flags.h"
|
| #include "net/base/net_errors.h"
|
|
|
| class LoadFromMemoryCacheDetails;
|
| @@ -58,15 +57,14 @@
|
|
|
| // Convenience methods for serializing/deserializing the security info.
|
| static std::string SerializeSecurityInfo(int cert_id,
|
| - net::CertStatus cert_status,
|
| + int cert_status,
|
| int security_bits,
|
| int connection_status);
|
| - CONTENT_EXPORT static bool DeserializeSecurityInfo(
|
| - const std::string& state,
|
| - int* cert_id,
|
| - net::CertStatus* cert_status,
|
| - int* security_bits,
|
| - int* connection_status);
|
| + CONTENT_EXPORT static bool DeserializeSecurityInfo(const std::string& state,
|
| + int* cert_id,
|
| + int* cert_status,
|
| + int* security_bits,
|
| + int* connection_status);
|
|
|
| // Construct an SSLManager for the specified tab.
|
| // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
|
|
|