Extract certificate policy application from NetworkLibrary.

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 55 matching lines @@
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/cryptohome_library.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/certificate_handler.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #endif
 
 using content::BrowserThread;
 
 namespace policy {
 
 namespace {
@@ skipping 315 matching lines @@
   return app_pack_updater_.get();
 }
 
 NetworkConfigurationUpdater*
     BrowserPolicyConnector::GetNetworkConfigurationUpdater() {
   if (!network_configuration_updater_) {
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(
             chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
       network_configuration_updater_.reset(
-          new NetworkConfigurationUpdaterImpl(GetPolicyService()));
+          new NetworkConfigurationUpdaterImpl(
+              GetPolicyService(),
+              chromeos::ManagedNetworkConfigurationHandler::Get(),
+              make_scoped_ptr(new chromeos::CertificateHandler)));
     } else {
       network_configuration_updater_.reset(
           new NetworkConfigurationUpdaterImplCros(
               GetPolicyService(),
-              chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
+              chromeos::CrosLibrary::Get()->GetNetworkLibrary(),
+              make_scoped_ptr(new chromeos::CertificateHandler)));
     }
   }
   return network_configuration_updater_.get();
 }
 
 net::CertTrustAnchorProvider*
     BrowserPolicyConnector::GetCertTrustAnchorProvider() {
   return GetNetworkConfigurationUpdater()->GetCertTrustAnchorProvider();
 }
 #endif
@@ skipping 170 matching lines @@
     return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy