Extract certificate policy application from NetworkLibrary.

chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_IMPL_CROS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_IMPL_CROS_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/cros/network_constants.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/policy/network_configuration_updater.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_constants.h"
 
 namespace base {
 class Value;
 }
 
+namespace chromeos {
+class CertificateHandler;
+}
+
 namespace policy {
 
 class PolicyMap;
 
 // DEPRECATED: will be replaced by NetworkConfigurationImpl.
 // This implementation pushes policies through the NetworkLibrary. It applies
 // network policies every time one of the relevant policies or Shill's profiles
 // changed or OnUserPolicyInitialized() is called. If the user policy is
 // available, always both the device and the user policy are applied. Otherwise
 // only the device policy is applied.
 class NetworkConfigurationUpdaterImplCros
     : public NetworkConfigurationUpdater,
       public chromeos::NetworkLibrary::NetworkProfileObserver {
  public:
   NetworkConfigurationUpdaterImplCros(
       PolicyService* policy_service,
-      chromeos::NetworkLibrary* network_library);
+      chromeos::NetworkLibrary* network_library,
+      scoped_ptr<chromeos::CertificateHandler> certificate_handler);
   virtual ~NetworkConfigurationUpdaterImplCros();
 
   // NetworkProfileObserver overrides.
   virtual void OnProfileListChanged() OVERRIDE;
 
   // NetworkConfigurationUpdater overrides.
 
   // In this implementation, this function applies both device and user policy.
   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
   // changed.
   void OnPolicyChanged(chromeos::onc::ONCSource onc_source,
                        const base::Value* previous,
                        const base::Value* current);
 
   // Retrieves the ONC policies from |policy_service_| and pushes the
   // configurations to |network_library_|. Ensures that a device policy is
   // always overwritten by a user policy.
   void ApplyNetworkConfigurations();
 
   // Push the policy stored at |policy_key| for |onc_source| to
   // |network_library_|.
   void ApplyNetworkConfiguration(const std::string& policy_key,
                                  chromeos::onc::ONCSource onc_source);
 
   // Wraps the policy service we read network configuration from.
   PolicyChangeRegistrar policy_change_registrar_;
 
   // Network library to write network configuration to.
   chromeos::NetworkLibrary* network_library_;
 
+  scoped_ptr<chromeos::CertificateHandler> certificate_handler_;
+
   // Whether the user policy is already available.
   bool user_policy_initialized_;
 
-  // Whether Web trust is allowed or not.
-  bool allow_trusted_certificates_from_policy_;
-
   // The policy service storing the ONC policies.
   PolicyService* policy_service_;
 
-  // An implementation of CertTrustAnchorProvider. Owned by the updater, but
-  // lives on the IO thread.
-  net::CertTrustAnchorProvider* cert_trust_provider_;
-
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdaterImplCros);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_IMPL_CROS_H_