| Index: chromeos/network/client_cert_store_chromeos.h
|
| diff --git a/net/ssl/client_cert_store_chromeos.h b/chromeos/network/client_cert_store_chromeos.h
|
| similarity index 42%
|
| rename from net/ssl/client_cert_store_chromeos.h
|
| rename to chromeos/network/client_cert_store_chromeos.h
|
| index 940888d1539a685cb1e71b73d46513c24e83df32..1984595111aaae1860b4ff32de8ee051aa0d3ced 100644
|
| --- a/net/ssl/client_cert_store_chromeos.h
|
| +++ b/chromeos/network/client_cert_store_chromeos.h
|
| @@ -2,54 +2,60 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef NET_SSL_CLIENT_CERT_STORE_CHROMEOS_H_
|
| -#define NET_SSL_CLIENT_CERT_STORE_CHROMEOS_H_
|
| +#ifndef CHROMEOS_NETWORK_CLIENT_CERT_STORE_CHROMEOS_H_
|
| +#define CHROMEOS_NETWORK_CLIENT_CERT_STORE_CHROMEOS_H_
|
|
|
| #include <string>
|
|
|
| +#include "base/memory/weak_ptr.h"
|
| +#include "chromeos/chromeos_export.h"
|
| #include "crypto/scoped_nss_types.h"
|
| #include "net/cert/nss_profile_filter_chromeos.h"
|
| #include "net/ssl/client_cert_store_nss.h"
|
|
|
| +class CertDatabaseServiceIOPart;
|
| +
|
| namespace net {
|
| +class NSSCertDatabase;
|
| +}
|
| +
|
| +namespace chromeos {
|
|
|
| -class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS {
|
| +class CHROMEOS_EXPORT ClientCertStoreChromeOS : public net::ClientCertStoreNSS {
|
| public:
|
| // Constructs a ClientCertStore that will return client certs available on
|
| // the user's private and public slots. If |use_system_slot| is true, certs on
|
| // the system slot will also be returned.
|
| ClientCertStoreChromeOS(
|
| - bool use_system_slot,
|
| - const std::string& username_hash,
|
| + const base::WeakPtr<CertDatabaseServiceIOPart>& cert_db_io,
|
| const PasswordDelegateFactory& password_delegate_factory);
|
| virtual ~ClientCertStoreChromeOS();
|
|
|
| // ClientCertStoreNSS:
|
| - virtual void GetClientCerts(const SSLCertRequestInfo& cert_request_info,
|
| - CertificateList* selected_certs,
|
| + virtual void GetClientCerts(const net::SSLCertRequestInfo& cert_request_info,
|
| + net::CertificateList* selected_certs,
|
| const base::Closure& callback) OVERRIDE;
|
|
|
| protected:
|
| // ClientCertStoreNSS:
|
| - virtual void GetClientCertsImpl(CERTCertList* cert_list,
|
| - const SSLCertRequestInfo& request,
|
| - bool query_nssdb,
|
| - CertificateList* selected_certs) OVERRIDE;
|
| + virtual void GetClientCertsImpl(
|
| + CERTCertList* cert_list,
|
| + const net::SSLCertRequestInfo& request,
|
| + bool query_nssdb,
|
| + net::CertificateList* selected_certs) OVERRIDE;
|
|
|
| private:
|
| - void DidGetSystemAndPrivateSlot(const SSLCertRequestInfo* request,
|
| - CertificateList* selected_certs,
|
| - const base::Closure& callback,
|
| - crypto::ScopedPK11Slot system_slot,
|
| - crypto::ScopedPK11Slot private_slot);
|
| + void DidGetNSSCertDatabase(const net::SSLCertRequestInfo* request,
|
| + net::CertificateList* selected_certs,
|
| + const base::Closure& callback,
|
| + net::NSSCertDatabase* nss_cert_db);
|
|
|
| - bool use_system_slot_;
|
| - std::string username_hash_;
|
| - NSSProfileFilterChromeOS profile_filter_;
|
| + base::WeakPtr<CertDatabaseServiceIOPart> cert_db_io_;
|
| + net::NSSProfileFilterChromeOS profile_filter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ClientCertStoreChromeOS);
|
| };
|
|
|
| -} // namespace net
|
| +} // namespace chromeos
|
|
|
| -#endif // NET_SSL_CLIENT_CERT_STORE_CHROMEOS_H_
|
| +#endif // CHROMEOS_NETWORK_CLIENT_CERT_STORE_CHROMEOS_H_
|
|
|