Extract certificate policy application from NetworkLibrary.

chrome/browser/chromeos/policy/network_configuration_updater_impl.h

Index: chrome/browser/chromeos/policy/network_configuration_updater_impl.h
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_impl.h b/chrome/browser/chromeos/policy/network_configuration_updater_impl.h
index 52a758bb7d73814d0f58c7e4da9892b84a4b946d..63b5735cceb5437e07d726a74ea1027316025e9e 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl.h
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_impl.h
@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_IMPL_H_
 
-#include <string>
-
 #include "chrome/browser/chromeos/policy/network_configuration_updater.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chromeos/network/onc/onc_constants.h"
@@ -15,6 +13,11 @@ namespace base {
 class Value;
 }
 
+namespace chromeos {
+class CertificateHandler;
+class ManagedNetworkConfigurationHandler;
+}
+
 namespace policy {
 
 class PolicyMap;
@@ -26,15 +29,14 @@ class PolicyMap;
 // ignored.
 class NetworkConfigurationUpdaterImpl : public NetworkConfigurationUpdater {
  public:
-  explicit NetworkConfigurationUpdaterImpl(PolicyService* policy_service);
+  NetworkConfigurationUpdaterImpl(
+      PolicyService* policy_service,
+      chromeos::ManagedNetworkConfigurationHandler* network_config_handler,
+      scoped_ptr<chromeos::CertificateHandler> certificate_handler);
   virtual ~NetworkConfigurationUpdaterImpl();
 
   // NetworkConfigurationUpdater overrides.
-
   virtual void OnUserPolicyInitialized() OVERRIDE;
-  virtual void set_allow_trusted_certificates_from_policy(bool allow) OVERRIDE {
-  }
-  virtual net::CertTrustAnchorProvider* GetCertTrustAnchorProvider() OVERRIDE;
 
  private:
   // Callback that's called by |policy_service_| if the respective ONC policy
@@ -54,6 +56,11 @@ class NetworkConfigurationUpdaterImpl : public NetworkConfigurationUpdater {
   // The policy service storing the ONC policies.
   PolicyService* policy_service_;
 
+  // Pointer to the global singleton or mock provided to the constructor.
+  chromeos::ManagedNetworkConfigurationHandler* network_config_handler_;
+
+  scoped_ptr<chromeos::CertificateHandler> certificate_handler_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdaterImpl);
 };