| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
|
| index 48a22d0b26538131c05f8e46282b51e494b10108..14d504a5908bfec1e68b84aa5de65e5ca30858a8 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -47,7 +47,8 @@
|
| #include "net/test/spawned_test_server/spawned_test_server.h"
|
|
|
| #if defined(USE_NSS)
|
| -#include "chrome/browser/net/nss_context.h"
|
| +#include "chrome/browser/net/cert_database_service_factory.h"
|
| +#include "components/cert_database/public/cert_database_service.h"
|
| #include "net/base/crypto_module.h"
|
| #include "net/cert/nss_cert_database.h"
|
| #endif // defined(USE_NSS)
|
| @@ -742,18 +743,19 @@ class SSLUITestWithClientCert : public SSLUITest {
|
| SSLUITest::SetUpOnMainThread();
|
|
|
| base::RunLoop loop;
|
| - GetNSSCertDatabaseForProfile(
|
| - browser()->profile(),
|
| - base::Bind(&SSLUITestWithClientCert::DidGetCertDatabase,
|
| - base::Unretained(this),
|
| - &loop));
|
| + CertDatabaseServiceFactory::GetForBrowserContext(browser()->profile())
|
| + ->GetNSSCertDatabase(
|
| + base::Bind(&SSLUITestWithClientCert::DidGetCertDatabase,
|
| + base::Unretained(this),
|
| + loop.QuitClosure()));
|
| loop.Run();
|
| }
|
|
|
| protected:
|
| - void DidGetCertDatabase(base::RunLoop* loop, net::NSSCertDatabase* cert_db) {
|
| + void DidGetCertDatabase(const base::Closure& done_callback,
|
| + net::NSSCertDatabase* cert_db) {
|
| cert_db_ = cert_db;
|
| - loop->Quit();
|
| + done_callback.Run();
|
| }
|
|
|
| net::NSSCertDatabase* cert_db_;
|
|
|