policy: Make UserNetworkConfigurationUpdater a BCKS.

chrome/browser/policy/profile_policy_connector.cc

Index: 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 7529b44be9f9e00b3da32c86b1b0a08d94c6d6a8..72cd5b83e40886bfd2c0afe8a258411f6bd99d4c 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/policy/device_local_account_policy_provider.h"
 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.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"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #endif
@@ -57,7 +54,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(
@@ -68,11 +64,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());
@@ -86,16 +77,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<chromeos::onc::CertificateImporter>(
-                new chromeos::onc::CertificateImporterImpl),
-            policy_service(),
-            chromeos::NetworkHandler::Get()
-                ->managed_network_configuration_handler());
   }
 #endif
 }
@@ -108,30 +89,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() {