Make CertificateHandler a proper interface of CertificateImporter.

chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

 // Copyright (c) 2013 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/chromeos/policy/network_configuration_updater_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/browser/policy/policy_map.h"
-#include "chromeos/network/certificate_handler.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
+#include "chromeos/network/onc/onc_certificate_importer.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
 
 NetworkConfigurationUpdaterImpl::NetworkConfigurationUpdaterImpl(
     PolicyService* device_policy_service,
-    scoped_ptr<chromeos::CertificateHandler> certificate_handler)
+    scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer)
     : device_policy_change_registrar_(device_policy_service,
                                       PolicyNamespace(POLICY_DOMAIN_CHROME,
                                                       std::string())),
       user_policy_service_(NULL),
       device_policy_service_(device_policy_service),
-      certificate_handler_(certificate_handler.Pass()) {
+      certificate_importer_(certificate_importer.Pass()) {
   device_policy_change_registrar_.Observe(
       key::kDeviceOpenNetworkConfiguration,
       base::Bind(&NetworkConfigurationUpdaterImpl::OnPolicyChanged,
                  base::Unretained(this),
                  chromeos::onc::ONC_SOURCE_DEVICE_POLICY));
 
   if (device_policy_service_->IsInitializationComplete(POLICY_DOMAIN_CHROME)) {
     // Apply the current device policies immediately.
     VLOG(1) << "Device policy service is already initialized.";
     ApplyNetworkConfiguration(chromeos::onc::ONC_SOURCE_DEVICE_POLICY);
@@ skipping 107 matching lines @@
     VLOG(2) << "The policy is not set.";
   }
   VLOG(2) << "The policy contains this ONC: " << onc_blob;
 
   base::ListValue network_configs;
   base::ListValue certificates;
   chromeos::onc::ParseAndValidateOncForImport(
       onc_blob, onc_source, "", &network_configs, &certificates);
 
   scoped_ptr<net::CertificateList> web_trust_certs(new net::CertificateList);
-  certificate_handler_->ImportCertificates(
+  certificate_importer_->ImportCertificates(
       certificates, onc_source, web_trust_certs.get());
 
   std::string userhash;
   if (onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY) {
     userhash = hashed_username_;
     chromeos::onc::ExpandStringPlaceholdersInNetworksForUser(hashed_username_,
                                                              &network_configs);
   }
 
   chromeos::NetworkHandler::Get()->managed_network_configuration_handler()->
       SetPolicy(onc_source, userhash, network_configs);
 
   if (onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY)
     SetTrustAnchors(web_trust_certs.Pass());
 }
 
 }  // namespace policy