Replace c/b/nss_context by a KeyedService.

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index e959c6b367077c716560167499489402c75a0530..45bc198bae9a62c073ab62a59ff771ed78d4c1e2 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -76,11 +76,12 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 #include "chrome/browser/chromeos/system_logs/debug_log_writer.h"
-#include "chrome/browser/net/nss_context.h"
+#include "chrome/browser/net/cert_database_service_factory.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #include "chromeos/network/onc/onc_utils.h"
+#include "components/cert_database/public/cert_database_service.h"
 #include "components/user_manager/user.h"
 #endif
 
@@ -250,13 +251,6 @@ class NetInternalsMessageHandler
   void OnSetNetworkDebugModeCompleted(const std::string& subsystem,
                                       bool succeeded);
 
-  // Callback to |GetNSSCertDatabaseForProfile| used to retrieve the database
-  // to which user's ONC defined certificates should be imported.
-  // It parses and imports |onc_blob|.
-  void ImportONCFileToNSSDB(const std::string& onc_blob,
-                            const std::string& passcode,
-                            net::NSSCertDatabase* nssdb);
-
   // Called back by the CertificateImporter when a certificate import finished.
   // |previous_error| contains earlier errors during this import.
   void OnCertificatesImported(
@@ -1409,10 +1403,14 @@ void NetInternalsMessageHandler::OnGetSystemLog(
   syslogs_getter_->RequestSystemLog(list);
 }
 
-void NetInternalsMessageHandler::ImportONCFileToNSSDB(
-    const std::string& onc_blob,
-    const std::string& passcode,
-    net::NSSCertDatabase* nssdb) {
+void NetInternalsMessageHandler::OnImportONCFile(const base::ListValue* list) {
+  std::string onc_blob;
+  std::string passcode;
+  if (list->GetSize() != 2 || !list->GetString(0, &onc_blob) ||
+      !list->GetString(1, &passcode)) {
+    NOTREACHED();
+  }
+
   user_manager::User* user = chromeos::ProfileHelper::Get()->GetUserByProfile(
       Profile::FromWebUI(web_ui()));
 
@@ -1441,8 +1439,12 @@ void NetInternalsMessageHandler::ImportONCFileToNSSDB(
   if (!network_error.empty())
     error += network_error;
 
+  cert_database::CertDatabaseService* cert_service =
+      cert_database::CertDatabaseServiceFactory::GetForBrowserContext(
+          web_ui()->GetWebContents()->GetBrowserContext());
   chromeos::onc::CertificateImporterImpl cert_importer(
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), nssdb);
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+      cert_service->GetIOPart());

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

May be NULL

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

Done.

   cert_importer.ImportCertificates(
       certificates,
       onc_source,
@@ -1462,22 +1464,6 @@ void NetInternalsMessageHandler::OnCertificatesImported(
   SendJavascriptCommand("receivedONCFileParse", new base::StringValue(error));
 }
 
-void NetInternalsMessageHandler::OnImportONCFile(
-    const base::ListValue* list) {
-  std::string onc_blob;
-  std::string passcode;
-  if (list->GetSize() != 2 ||
-      !list->GetString(0, &onc_blob) ||
-      !list->GetString(1, &passcode)) {
-    NOTREACHED();
-  }
-
-  GetNSSCertDatabaseForProfile(
-      Profile::FromWebUI(web_ui()),
-      base::Bind(&NetInternalsMessageHandler::ImportONCFileToNSSDB, AsWeakPtr(),
-                 onc_blob, passcode));
-}
-
 void NetInternalsMessageHandler::OnStoreDebugLogs(const base::ListValue* list) {
   DCHECK(list);