Refactor the client certificate code in chromeos/network/.

chrome/browser/chromeos/cros/network_library.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/cros/network_library.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"  // for debug output only.
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "chrome/browser/chromeos/cros/native_network_constants.h"
 #include "chrome/browser/chromeos/cros/native_network_parser.h"
 #include "chrome/browser/chromeos/cros/network_library_impl_cros.h"
 #include "chrome/browser/chromeos/cros/network_library_impl_stub.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "chromeos/network/certificate_pattern.h"
-#include "chromeos/network/certificate_pattern_matcher.h"
+#include "chromeos/network/client_cert_util.h"
 #include "chromeos/network/cros_network_functions.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/ash_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/url_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 730 matching lines @@
   // We skip certificate patterns for device policy ONC so that an unmanaged
   // user can't get to the place where a cert is presented for them
   // involuntarily.
   if (client_cert_pattern().Empty() ||
       ui_data().onc_source() == onc::ONC_SOURCE_DEVICE_POLICY) {
     connect.Run();
     return;
   }
 
   scoped_refptr<net::X509Certificate> matching_cert =
-      certificate_pattern::GetCertificateMatch(client_cert_pattern());
+      client_cert::GetCertificateMatch(client_cert_pattern());
   if (matching_cert.get()) {
     std::string client_cert_id =
         x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle());
     if (provider_type() == PROVIDER_TYPE_OPEN_VPN) {
       SetStringProperty(flimflam::kOpenVPNClientCertIdProperty,
                         client_cert_id, &client_cert_id_);
     } else {
       SetStringProperty(flimflam::kL2tpIpsecClientCertIdProperty,
                         client_cert_id, &client_cert_id_);
     }
@@ skipping 496 matching lines @@
 void WifiNetwork::MatchCertificatePattern(bool allow_enroll,
                                           const base::Closure& connect) {
   DCHECK(client_cert_type() == CLIENT_CERT_TYPE_PATTERN);
   DCHECK(!client_cert_pattern().Empty());
   if (client_cert_pattern().Empty()) {
     connect.Run();
     return;
   }
 
   scoped_refptr<net::X509Certificate> matching_cert =
-      certificate_pattern::GetCertificateMatch(client_cert_pattern());
+      client_cert::GetCertificateMatch(client_cert_pattern());
   if (matching_cert.get()) {
     SetEAPClientCertPkcs11Id(
         x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle()));
   } else {
     if (allow_enroll && enrollment_delegate()) {
       // Wrap the closure in another callback so that we can retry the
       // certificate match again before actually connecting.
       base::Closure wrapped_connect =
           base::Bind(&WifiNetwork::MatchCertificatePattern,
                      weak_pointer_factory_.GetWeakPtr(),
@@ skipping 87 matching lines @@
 }
 
 // static
 void NetworkLibrary::SetForTesting(NetworkLibrary* library) {
   if (g_network_library)
     delete g_network_library;
   g_network_library = library;
 }
 
 }  // namespace chromeos