Make CertificateHandler a proper interface of CertificateImporter.

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 onc {
+class CertificateImporter;
+}
 }
 
 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 PolicyService::Observer {
  public:
   // The pointer |device_policy_service| is stored. The caller must guarantee
   // that it's outliving the updater.
   NetworkConfigurationUpdaterImplCros(
       PolicyService* device_policy_service,
       chromeos::NetworkLibrary* network_library,
-      scoped_ptr<chromeos::CertificateHandler> certificate_handler);
+      scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer);
   virtual ~NetworkConfigurationUpdaterImplCros();
 
   // NetworkProfileObserver overrides.
   virtual void OnProfileListChanged() OVERRIDE;
 
   // NetworkConfigurationUpdater overrides.
 
   // In this implementation, this function applies both device and user policy.
   virtual void SetUserPolicyService(
       bool allow_trusted_certs_from_policy,
@@ skipping 25 matching lines @@
   void ApplyNetworkConfiguration(const std::string& policy_key,
                                  chromeos::onc::ONCSource onc_source,
                                  PolicyService* policy_service);
 
   // 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_;
+  scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer_;
 
   // Needed to check whether user policies are ready.
   // Unowned.
   PolicyService* user_policy_service_;
 
   // The device policy service storing the ONC policies. Also needed to check
   // whether device policies are ready.
   // Unowned.
   PolicyService* device_policy_service_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdaterImplCros);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_IMPL_CROS_H_