Replace c/b/nss_context by a KeyedService.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 58 matching lines @@
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
 #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
 
 #if defined(OS_WIN)
 #include "chrome/browser/net/service_providers_win.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
@@ skipping 149 matching lines @@
   void OnRefreshSystemLogs(const base::ListValue* list);
   void OnGetSystemLog(const base::ListValue* list);
   void OnImportONCFile(const base::ListValue* list);
   void OnStoreDebugLogs(const base::ListValue* list);
   void OnStoreDebugLogsCompleted(const base::FilePath& log_path,
                                  bool succeeded);
   void OnSetNetworkDebugMode(const base::ListValue* list);
   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(
       const std::string& previous_error,
       bool success,
       const net::CertificateList& onc_trusted_certificates);
 #endif
 
  private:
   class IOThreadImpl;
@@ skipping 1132 matching lines @@
   syslogs_getter_->DeleteSystemLogs();
   syslogs_getter_->LoadSystemLogs();
 }
 
 void NetInternalsMessageHandler::OnGetSystemLog(
     const base::ListValue* list) {
   DCHECK(syslogs_getter_.get());
   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()));
 
   if (!user) {
     std::string error = "User not found.";
     SendJavascriptCommand("receivedONCFileParse", new base::StringValue(error));
     return;
   }
 
   std::string error;
   onc::ONCSource onc_source = onc::ONC_SOURCE_USER_IMPORT;
   base::ListValue network_configs;
   base::DictionaryValue global_network_config;
   base::ListValue certificates;
   if (!chromeos::onc::ParseAndValidateOncForImport(onc_blob,
                                                    onc_source,
                                                    passcode,
                                                    &network_configs,
                                                    &global_network_config,
                                                    &certificates)) {
     error = "Errors occurred during the ONC parsing. ";
   }
 
   std::string network_error;
   chromeos::onc::ImportNetworksForUser(user, network_configs, &network_error);
   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,
       base::Bind(&NetInternalsMessageHandler::OnCertificatesImported,
                  AsWeakPtr(),
                  error));
 }
 
 void NetInternalsMessageHandler::OnCertificatesImported(
     const std::string& previous_error,
     bool success,
     const net::CertificateList& /* unused onc_trusted_certificates */) {
   std::string error = previous_error;
   if (!success)
     error += "Some certificates couldn't be imported. ";
 
   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);
 
   SendJavascriptCommand("receivedStoreDebugLogs",
                         new base::StringValue("Creating log file..."));
   Profile* profile = Profile::FromWebUI(web_ui());
   const DownloadPrefs* const prefs = DownloadPrefs::FromBrowserContext(profile);
   base::FilePath path = prefs->DownloadPath();
   if (file_manager::util::IsUnderNonNativeLocalPath(profile, path))
     path = prefs->GetDefaultDownloadDirectoryForProfile();
@@ skipping 233 matching lines @@
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
 }