| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index f49e3e847b17319e435ec05df5167ce6b23083b5..84f4ca64e67d4d083175513f563d85b8517f308e 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -45,6 +45,10 @@ class ProtocolHandlerRegistry;
|
| class SigninNamesOnIOThread;
|
| class SupervisedUserURLFilter;
|
|
|
| +namespace cert_database {
|
| +class CertDatabaseServiceIOPart;
|
| +}
|
| +
|
| namespace chrome_browser_net {
|
| class ResourcePrefetchPredictorObserver;
|
| }
|
| @@ -215,14 +219,6 @@ class ProfileIOData {
|
| return transport_security_state_.get();
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| - std::string username_hash() const {
|
| - return username_hash_;
|
| - }
|
| -
|
| - bool use_system_key_slot() const { return use_system_key_slot_; }
|
| -#endif
|
| -
|
| Profile::ProfileType profile_type() const {
|
| return profile_type_;
|
| }
|
| @@ -339,7 +335,6 @@ class ProfileIOData {
|
|
|
| #if defined(OS_CHROMEOS)
|
| std::string username_hash;
|
| - bool use_system_key_slot;
|
| #endif
|
|
|
| // The profile this struct was populated from. It's passed as a void* to
|
| @@ -673,8 +668,10 @@ class ProfileIOData {
|
| // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
|
| mutable policy::PolicyCertVerifier* policy_cert_verifier_;
|
| mutable scoped_ptr<net::CertVerifier> cert_verifier_;
|
| - mutable std::string username_hash_;
|
| - mutable bool use_system_key_slot_;
|
| +#endif
|
| +
|
| +#if defined(USE_NSS)
|
| + mutable base::WeakPtr<cert_database::CertDatabaseServiceIOPart> cert_db_io_;
|
| #endif
|
|
|
| mutable scoped_ptr<net::TransportSecurityPersister>
|
|
|