| Index: chrome/browser/certificate_manager_model.cc
|
| diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
|
| index a129f087edb9d66ae42f321ed4d25832b298c847..501ea63fa169fa2c35fbf14e43da7f25474f7721 100644
|
| --- a/chrome/browser/certificate_manager_model.cc
|
| +++ b/chrome/browser/certificate_manager_model.cc
|
| @@ -8,10 +8,12 @@
|
| #include "base/i18n/time_formatting.h"
|
| #include "base/logging.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/browser/net/nss_context.h"
|
| +#include "chrome/browser/net/cert_database_service_factory.h"
|
| #include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
|
| #include "chrome/common/net/x509_certificate_model.h"
|
| #include "chrome/grit/generated_resources.h"
|
| +#include "components/cert_database/public/cert_database_service.h"
|
| +#include "components/cert_database/public/cert_database_service_io_part.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/resource_context.h"
|
| @@ -49,15 +51,17 @@ using content::BrowserThread;
|
|
|
| // static
|
| void CertificateManagerModel::Create(
|
| - content::BrowserContext* browser_context,
|
| + content::BrowserContext* context,
|
| CertificateManagerModel::Observer* observer,
|
| const CreationCallback& callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| + CertDatabaseService* cert_db_service =
|
| + CertDatabaseServiceFactory::GetForBrowserContext(context);
|
| BrowserThread::PostTask(
|
| BrowserThread::IO,
|
| FROM_HERE,
|
| base::Bind(&CertificateManagerModel::GetCertDBOnIOThread,
|
| - browser_context->GetResourceContext(),
|
| + cert_db_service->GetIOPart(),
|
| observer,
|
| callback));
|
| }
|
| @@ -240,15 +244,17 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
|
|
|
| // static
|
| void CertificateManagerModel::GetCertDBOnIOThread(
|
| - content::ResourceContext* context,
|
| + base::WeakPtr<CertDatabaseServiceIOPart> cert_db_service_io,
|
| CertificateManagerModel::Observer* observer,
|
| const CreationCallback& callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| - net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
|
| - context,
|
| - base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread,
|
| - observer,
|
| - callback));
|
| + if (!cert_db_service_io)
|
| + return;
|
| +
|
| + base::Callback<void(net::NSSCertDatabase*)> get_db_callback = base::Bind(
|
| + &CertificateManagerModel::DidGetCertDBOnIOThread, observer, callback);
|
| + net::NSSCertDatabase* cert_db =
|
| + cert_db_service_io->GetNSSCertDatabase(get_db_callback);
|
| if (cert_db)
|
| - DidGetCertDBOnIOThread(observer, callback, cert_db);
|
| + get_db_callback.Run(cert_db);
|
| }
|
|
|