Make CertificateHandler a proper interface of CertificateImporter.

chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.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/chromeos/policy/network_configuration_updater_impl_cros.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/policy/policy_map.h"
-#include "chromeos/network/certificate_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 {
 
 NetworkConfigurationUpdaterImplCros::NetworkConfigurationUpdaterImplCros(
     PolicyService* device_policy_service,
     chromeos::NetworkLibrary* network_library,
-    scoped_ptr<chromeos::CertificateHandler> certificate_handler)
+    scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer)
     : policy_change_registrar_(
           device_policy_service,
           PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())),
       network_library_(network_library),
-      certificate_handler_(certificate_handler.Pass()),
+      certificate_importer_(certificate_importer.Pass()),
       user_policy_service_(NULL),
       device_policy_service_(device_policy_service) {
   DCHECK(network_library_);
   policy_change_registrar_.Observe(
       key::kDeviceOpenNetworkConfiguration,
       base::Bind(&NetworkConfigurationUpdaterImplCros::OnPolicyChanged,
                  base::Unretained(this),
                  chromeos::onc::ONC_SOURCE_DEVICE_POLICY));
   policy_change_registrar_.Observe(
       key::kOpenNetworkConfiguration,
@@ skipping 118 matching lines @@
                    << " is not a string value.";
     }
   }
 
   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());
 
   network_library_->LoadOncNetworks(network_configs, onc_source);
 
   if (onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY)
     SetTrustAnchors(web_trust_certs.Pass());
 }
 
 }  // namespace policy