Make OncNetworkParserTest use the pre-existing GetCertType implementation.

chrome/browser/chromeos/cros/onc_network_parser_unittest.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/onc_network_parser.h"
 
 #include <cert.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/certificate_pattern.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/net/x509_certificate_model.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/test/test_browser_thread.h"
 #include "crypto/nss_util.h"
 #include "net/base/cert_database.h"
 #include "net/base/cert_type.h"
 #include "net/base/crypto_module.h"
 #include "net/base/x509_certificate.h"
 #include "net/proxy/proxy_config.h"
 #include "net/third_party/mozilla_security_manager/nsNSSCertTrust.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using ::testing::AnyNumber;
 using ::testing::Return;
 
 namespace msm = mozilla_security_manager;
 namespace chromeos {
 
 namespace {
 
 const char g_token_name[] = "OncNetworkParserTest token";
 
 net::CertType GetCertType(const net::X509Certificate* cert) {
   DCHECK(cert);
-  msm::nsNSSCertTrust trust(cert->os_cert_handle()->trust);
-  if (trust.HasAnyUser())
-    return net::USER_CERT;
-  if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE))
-    return net::SERVER_CERT;
-  if (trust.HasAnyCA() || CERT_IsCACert(cert->os_cert_handle(), NULL))
-    return net::CA_CERT;
-  return net::UNKNOWN_CERT;
+  return x509_certificate_model::GetType(cert->os_cert_handle());
 }
 
 }  // namespace
 
 class OncNetworkParserTest : public testing::Test {
  public:
   static void SetUpTestCase() {
     // Ideally, we'd open a test DB for each test case, and close it
     // again, removing the temp dir, but unfortunately, there's a
     // bug in NSS that prevents this from working, so we just open
@@ skipping 850 matching lines @@
 
   EXPECT_EQ("a onc b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_id_pattern, source));
   EXPECT_EQ("a onc@example.com b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_email_pattern, source));
 }
 
 }  // namespace chromeos