Chromium Code Reviews| 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 b43b0d467dfd458cd78553d3dec2b98c2c014a60..748d855a38fe1f05f37397d022ad81d054244fe5 100644 |
| --- a/chrome/browser/profiles/profile_io_data.h |
| +++ b/chrome/browser/profiles/profile_io_data.h |
| @@ -42,6 +42,8 @@ class ProtocolHandlerRegistry; |
| class SigninNamesOnIOThread; |
| class SupervisedUserURLFilter; |
| +class CertDatabaseServiceIOPart; |
| + |
| namespace extensions { |
| class InfoMap; |
| } |
| @@ -219,8 +221,6 @@ class ProfileIOData { |
| std::string username_hash() const { |
|
mattm
2014/09/05 07:35:29
I think this can be removed too
pneubeck (no reviews)
2014/09/05 08:04:56
Yes, I've removed it now from ProfileIOData.
But s
|
| return username_hash_; |
| } |
| - |
| - bool use_system_key_slot() const { return use_system_key_slot_; } |
| #endif |
| Profile::ProfileType profile_type() const { |
| @@ -334,7 +334,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 |
| @@ -593,7 +592,10 @@ class ProfileIOData { |
| 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<CertDatabaseServiceIOPart> cert_db_io_; |
| #endif |
| mutable scoped_ptr<net::TransportSecurityPersister> |