Make CertificateHandler a proper interface of CertificateImporter.

chromeos/chromeos.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'chromeos_memory.gypi',
@@ skipping 193 matching lines @@
         'ime/input_method_property.cc',
         'ime/input_method_property.h',
         'ime/input_method_whitelist.cc',
         'ime/input_method_whitelist.h',
         'ime/xkeyboard.cc',
         'ime/xkeyboard.h',
         'login/login_state.cc',
         'login/login_state.h',
         'network/cert_loader.cc',
         'network/cert_loader.h',
-        'network/certificate_handler.cc',
-        'network/certificate_handler.h',
         'network/certificate_pattern.cc',
         'network/certificate_pattern.h',
         'network/certificate_pattern_matcher.cc',
         'network/certificate_pattern_matcher.h',
         'network/cros_network_functions.cc',
         'network/cros_network_functions.h',
         'network/device_state.cc',
         'network/device_state.h',
         'network/favorite_state.cc',
         'network/favorite_state.h',
@@ skipping 31 matching lines @@
         'network/network_state.cc',
         'network/network_state.h',
         'network/network_state_handler.cc',
         'network/network_state_handler.h',
         'network/network_state_handler_observer.cc',
         'network/network_state_handler_observer.h',
         'network/network_ui_data.cc',
         'network/network_ui_data.h',
         'network/network_util.cc',
         'network/network_util.h',
-        'network/onc/onc_certificate_importer.cc',
         'network/onc/onc_certificate_importer.h',
+        'network/onc/onc_certificate_importer_impl.cc',
+        'network/onc/onc_certificate_importer_impl.h',
         'network/onc/onc_constants.cc',
         'network/onc/onc_constants.h',
         'network/onc/onc_mapper.cc',
         'network/onc/onc_mapper.h',
         'network/onc/onc_merger.cc',
         'network/onc/onc_merger.h',
         'network/onc/onc_normalizer.cc',
         'network/onc/onc_normalizer.h',
         'network/onc/onc_signature.cc',
         'network/onc/onc_signature.h',
@@ skipping 86 matching lines @@
         'dbus/mock_shill_profile_client.cc',
         'dbus/mock_shill_profile_client.h',
         'dbus/mock_shill_service_client.cc',
         'dbus/mock_shill_service_client.h',
         'dbus/shill_profile_client_stub.cc',
         'dbus/shill_profile_client_stub.h',
         'disks/mock_disk_mount_manager.cc',
         'disks/mock_disk_mount_manager.h',
         'ime/mock_component_extension_ime_manager_delegate.cc',
         'ime/mock_component_extension_ime_manager_delegate.h',
-        'network/mock_certificate_handler.cc',
-        'network/mock_certificate_handler.h',
+        'network/onc/mock_certificate_importer.cc',
+        'network/onc/mock_certificate_importer.h',
         'network/onc/onc_test_utils.cc',
         'network/onc/onc_test_utils.h',
       ],
       'include_dirs': [
         '..',
       ],
     },
     {
       'target_name': 'chromeos_test_support_without_gmock',
       'type': 'static_library',
@@ skipping 110 matching lines @@
         'network/network_configuration_handler_unittest.cc',
         'network/network_connection_handler_unittest.cc',
         'network/network_device_handler_unittest.cc',
         'network/network_event_log_unittest.cc',
         'network/network_profile_handler_stub.h',
         'network/network_sms_handler_unittest.cc',
         'network/network_state_handler_unittest.cc',
         'network/network_state_unittest.cc',
         'network/network_ui_data_unittest.cc',
         'network/network_util_unittest.cc',
-        'network/onc/onc_certificate_importer_unittest.cc',
+        'network/onc/onc_certificate_importer_impl_unittest.cc',
         'network/onc/onc_merger_unittest.cc',
         'network/onc/onc_normalizer_unittest.cc',
         'network/onc/onc_translator_unittest.cc',
         'network/onc/onc_utils_unittest.cc',
         'network/onc/onc_validator_unittest.cc',
         'network/shill_property_handler_unittest.cc',
         'process_proxy/process_output_watcher_unittest.cc',
         'process_proxy/process_proxy_unittest.cc',
         'system/name_value_pairs_parser_unittest.cc',
       ],
@@ skipping 21 matching lines @@
         '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
         'proto_out_dir': 'chromeos/dbus/power_manager',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }