chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc - Issue 148183013: Use per-user nssdb in onc certificate importer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

Issue 148183013: Use per-user nssdb in onc certificate importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix browser_tests compile Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/user_network_configuration_updater.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

index fed3c77197ef7f193150a2eda0bbd2d8ebbe1304..04bda5ad5bbfd7fe738e260a275030e80a01c550 100644

--- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

@@ -15,7 +15,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/pref_names.h"

#include "chromeos/network/network_handler.h"

-#include "chromeos/network/onc/onc_certificate_importer_impl.h"

#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"

#include "components/policy/core/common/cloud/cloud_policy_constants.h"

@@ -82,10 +81,9 @@ UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor(

ProfilePolicyConnectorFactory::GetForProfile(profile);

return UserNetworkConfigurationUpdater::CreateForUserPolicy(

+ profile,

allow_trusted_certs_from_policy,

*user,

- scoped_ptr<chromeos::onc::CertificateImporter>(

- new chromeos::onc::CertificateImporterImpl),

profile_connector->policy_service(),

chromeos::NetworkHandler::Get()->managed_network_configuration_handler())

.release();