Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(721)

Unified Diff: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

Issue 9791050: Make OncNetworkParserTest use the pre-existing GetCertType implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
diff --git a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
index b91a7c26804718b42384df5e4faab748f246ec49..9f0f5d4c09fefe7256dbc876ff729cec5879b9c5 100644
--- a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
+++ b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
@@ -23,6 +23,7 @@
#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"
@@ -48,14 +49,7 @@ 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698