From 89803dfad2d9e4e189116a71ab8901ae58afdb48 Mon Sep 17 00:00:00 2001 From: "pneubeck@chromium.org" Date: Thu, 7 Nov 2013 08:51:30 +0000 Subject: policy: Make UserNetworkConfigurationUpdater a BCKS. UserNetworkConfigurationUpdater is responsible to push network user policies to different backends (PolicyCertVerifier and ManagedNetworkConfigurationHandler). ProfilePolicyConnector is responsible to provide policies for the profile's PrefService. The tight coupling of these two classes is resolved with this commit. Depends on: https://codereview.chromium.org/54483004/ BUG=312660 R=dbeam@chromium.org, joaodasilva@chromium.org, willchan@chromium.org Review URL: https://codereview.chromium.org/53923004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233559 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/policy/profile_policy_connector.cc | 33 ----------------------- 1 file changed, 33 deletions(-) (limited to 'chrome/browser/policy/profile_policy_connector.cc') diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc index b45db05..96812cc 100644 --- a/chrome/browser/policy/profile_policy_connector.cc +++ b/chrome/browser/policy/profile_policy_connector.cc @@ -20,11 +20,8 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h" -#include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/common/pref_names.h" -#include "chromeos/network/network_handler.h" -#include "chromeos/network/onc/onc_certificate_importer_impl.h" #endif namespace policy { @@ -55,7 +52,6 @@ void ProfilePolicyConnector::Init( providers.push_back(user_cloud_policy_manager); #if defined(OS_CHROMEOS) - bool allow_trusted_certs_from_policy = false; if (!user) { // This case occurs for the signin profile. special_user_policy_provider_.reset( @@ -66,11 +62,6 @@ void ProfilePolicyConnector::Init( is_primary_user_ = user == chromeos::UserManager::Get()->GetPrimaryUser(); if (user->GetType() == chromeos::User::USER_TYPE_PUBLIC_ACCOUNT) InitializeDeviceLocalAccountPolicyProvider(user->email()); - // Allow trusted certs from policy only for managed regular accounts. - const bool is_managed = connector->GetUserAffiliation(user->email()) == - USER_AFFILIATION_MANAGED; - if (is_managed && user->GetType() == chromeos::User::USER_TYPE_REGULAR) - allow_trusted_certs_from_policy = true; } if (special_user_policy_provider_) providers.push_back(special_user_policy_provider_.get()); @@ -84,16 +75,6 @@ void ProfilePolicyConnector::Init( connector->SetUserPolicyDelegate(user_cloud_policy_manager); else if (special_user_policy_provider_) connector->SetUserPolicyDelegate(special_user_policy_provider_.get()); - - network_configuration_updater_ = - UserNetworkConfigurationUpdater::CreateForUserPolicy( - allow_trusted_certs_from_policy, - *user, - scoped_ptr( - new chromeos::onc::CertificateImporterImpl), - policy_service(), - chromeos::NetworkHandler::Get() - ->managed_network_configuration_handler()); } #endif } @@ -106,30 +87,16 @@ void ProfilePolicyConnector::Shutdown() { #if defined(OS_CHROMEOS) if (is_primary_user_) g_browser_process->browser_policy_connector()->SetUserPolicyDelegate(NULL); - network_configuration_updater_.reset(); if (special_user_policy_provider_) special_user_policy_provider_->Shutdown(); #endif } #if defined(OS_CHROMEOS) -void ProfilePolicyConnector::SetPolicyCertVerifier( - PolicyCertVerifier* cert_verifier) { - if (network_configuration_updater_) - network_configuration_updater_->SetPolicyCertVerifier(cert_verifier); -} - base::Closure ProfilePolicyConnector::GetPolicyCertTrustedCallback() { return base::Bind(&ProfilePolicyConnector::SetUsedPolicyCertificatesOnce, weak_ptr_factory_.GetWeakPtr()); } - -void ProfilePolicyConnector::GetWebTrustedCertificates( - net::CertificateList* certs) const { - certs->clear(); - if (network_configuration_updater_) - network_configuration_updater_->GetWebTrustedCertificates(certs); -} #endif bool ProfilePolicyConnector::UsedPolicyCertificates() { -- cgit v1.1