chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc - Issue 20041002: Make CertificateHandler a proper interface of CertificateImporter.

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/network_configuration_updater_impl_cros.cc

Issue 20041002: Make CertificateHandler a proper interface of CertificateImporter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments. Created 7 years, 5 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/network_configuration_updater_impl_cros.h ('k') | chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 95de6fb8b89ca7fe642add954f680b7f60636958..ebcf484dc94e1390437ad37e7c0c0c5aec2b0213 100644

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

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

@@ -12,7 +12,7 @@

#include "base/values.h"

#include "chrome/browser/chromeos/cros/network_library.h"

#include "chrome/browser/policy/policy_map.h"

-#include "chromeos/network/certificate_handler.h"

+#include "chromeos/network/onc/onc_certificate_importer.h"

#include "chromeos/network/onc/onc_constants.h"

#include "chromeos/network/onc/onc_utils.h"

#include "policy/policy_constants.h"

@@ -22,12 +22,12 @@ namespace policy {

NetworkConfigurationUpdaterImplCros::NetworkConfigurationUpdaterImplCros(

PolicyService* device_policy_service,

chromeos::NetworkLibrary* network_library,

- scoped_ptr<chromeos::CertificateHandler> certificate_handler)

+ scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer)

: policy_change_registrar_(

device_policy_service,

PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())),

network_library_(network_library),

- certificate_handler_(certificate_handler.Pass()),

+ certificate_importer_(certificate_importer.Pass()),

user_policy_service_(NULL),

device_policy_service_(device_policy_service) {

DCHECK(network_library_);

@@ -166,7 +166,7 @@ void NetworkConfigurationUpdaterImplCros::ApplyNetworkConfiguration(

onc_blob, onc_source, "", &network_configs, &certificates);

scoped_ptr<net::CertificateList> web_trust_certs(new net::CertificateList);

- certificate_handler_->ImportCertificates(

+ certificate_importer_->ImportCertificates(

certificates, onc_source, web_trust_certs.get());

network_library_->LoadOncNetworks(network_configs, onc_source);