| Index: chrome/browser/chromeos/cros/cert_library.cc
|
| diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc
|
| index 86aa9f5aee2eeeec7e65ff97600d2c2fd2592797..6e518fc7cfea8d6c16f2b07202634a5624cb1542 100644
|
| --- a/chrome/browser/chromeos/cros/cert_library.cc
|
| +++ b/chrome/browser/chromeos/cros/cert_library.cc
|
| @@ -111,11 +111,11 @@ bool CertLibrary::IsInitialized() {
|
| }
|
|
|
| CertLibrary::CertLibrary() {
|
| - CertLoader::Get()->AddObserver(this);
|
| + NetworkHandler::Get()->cert_loader()->AddObserver(this);
|
| }
|
|
|
| CertLibrary::~CertLibrary() {
|
| - CertLoader::Get()->RemoveObserver(this);
|
| + NetworkHandler::Get()->cert_loader()->RemoveObserver(this);
|
| }
|
|
|
| void CertLibrary::AddObserver(CertLibrary::Observer* observer) {
|
| @@ -127,15 +127,15 @@ void CertLibrary::RemoveObserver(CertLibrary::Observer* observer) {
|
| }
|
|
|
| bool CertLibrary::CertificatesLoading() const {
|
| - return CertLoader::Get()->CertificatesLoading();
|
| + return NetworkHandler::Get()->cert_loader()->CertificatesLoading();
|
| }
|
|
|
| bool CertLibrary::CertificatesLoaded() const {
|
| - return CertLoader::Get()->certificates_loaded();
|
| + return NetworkHandler::Get()->cert_loader()->certificates_loaded();
|
| }
|
|
|
| bool CertLibrary::IsHardwareBacked() const {
|
| - return CertLoader::Get()->IsHardwareBacked();
|
| + return NetworkHandler::Get()->cert_loader()->IsHardwareBacked();
|
| }
|
|
|
| int CertLibrary::NumCertificates(CertType type) const {
|
| @@ -160,12 +160,13 @@ std::string CertLibrary::GetCertPkcs11IdAt(CertType type, int index) const {
|
| }
|
|
|
| bool CertLibrary::IsCertHardwareBackedAt(CertType type, int index) const {
|
| - if (!CertLoader::Get()->IsHardwareBacked())
|
| + if (!NetworkHandler::Get()->cert_loader()->IsHardwareBacked())
|
| return false;
|
| net::X509Certificate* cert = GetCertificateAt(type, index);
|
| std::string cert_token_name =
|
| x509_certificate_model::GetTokenName(cert->os_cert_handle());
|
| - return cert_token_name == CertLoader::Get()->tpm_token_name();
|
| + return cert_token_name ==
|
| + NetworkHandler::Get()->cert_loader()->tpm_token_name();
|
| }
|
|
|
| int CertLibrary::GetCertIndexByNickname(CertType type,
|
|
|