| Index: chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| index b08227fa3bf0a72ac2820f2756ad258ac99a5722..2b8c820770cbc22466f2769c205feac799caba26 100644
|
| --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| @@ -33,8 +33,8 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| -#include "chrome/browser/policy/profile_policy_connector.h"
|
| -#include "chrome/browser/policy/profile_policy_connector_factory.h"
|
| +#include "chrome/browser/chromeos/policy/network_policy_service.h"
|
| +#include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #endif
|
| @@ -489,9 +489,11 @@ void CertificateManagerHandler::RegisterMessages() {
|
| void CertificateManagerHandler::CertificatesRefreshed() {
|
| net::CertificateList web_trusted_certs;
|
| #if defined(OS_CHROMEOS)
|
| - policy::ProfilePolicyConnectorFactory::GetForProfile(
|
| - Profile::FromWebUI(web_ui()))->GetWebTrustedCertificates(
|
| - &web_trusted_certs);
|
| + policy::NetworkPolicyService* service =
|
| + policy::NetworkPolicyServiceFactory::GetForProfile(
|
| + Profile::FromWebUI(web_ui()));
|
| + if (service)
|
| + service->GetWebTrustedCertificates(&web_trusted_certs);
|
| #endif
|
| PopulateTree("personalCertsTab", net::USER_CERT, web_trusted_certs);
|
| PopulateTree("serverCertsTab", net::SERVER_CERT, web_trusted_certs);
|
|
|