Replace c/b/nss_context by a KeyedService.

chrome/browser/ssl/ssl_browser_tests.cc

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 b737a75242f62b59b3c2990f185bf8bde93f8222..c35e2fa00322679ce8d0d81d14522dc6ba3513d4 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,20 @@ class SSLUITestWithClientCert : public SSLUITest {
      SSLUITest::SetUpOnMainThread();
 
      base::RunLoop loop;
-     GetNSSCertDatabaseForProfile(
-         browser()->profile(),
-         base::Bind(&SSLUITestWithClientCert::DidGetCertDatabase,
-                    base::Unretained(this),
-                    &loop));
+     cert_database::CertDatabaseServiceFactory::GetForBrowserContext(
+         browser()->profile())
+         ->GetNSSCertDatabase(

[Joao da Silva, 2014/10/30 09:48:01]

May be NULL?

[pneubeck (no reviews), 2014/11/05 14:53:36]

Done.

+             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_;