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

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

Issue 14566009: Add NetworkConnectionHandler class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert Associating Stub change for test Created 7 years, 7 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
Index: chrome/browser/chromeos/cros/network_library.cc
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 2eac4b2dd7880e714f95ae997a5010327e22ec9d..c453eb7eea8cae5a8184c8546f9859b0746e2725 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -10,7 +10,6 @@
#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/certificate_pattern_matcher.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/native_network_constants.h"
#include "chrome/browser/chromeos/cros/native_network_parser.h"
@@ -18,6 +17,7 @@
#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/cros_network_functions.h"
#include "chromeos/network/network_state_handler.h"
#include "content/public/browser/browser_thread.h"
@@ -779,7 +779,7 @@ void VirtualNetwork::MatchCertificatePattern(bool allow_enroll,
}
scoped_refptr<net::X509Certificate> matching_cert =
- GetCertificateMatch(client_cert_pattern());
+ certificate_pattern::GetCertificateMatch(client_cert_pattern());
if (matching_cert.get()) {
std::string client_cert_id =
x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle());
@@ -1301,7 +1301,7 @@ void WifiNetwork::MatchCertificatePattern(bool allow_enroll,
}
scoped_refptr<net::X509Certificate> matching_cert =
- GetCertificateMatch(client_cert_pattern());
+ certificate_pattern::GetCertificateMatch(client_cert_pattern());
if (matching_cert.get()) {
SetEAPClientCertPkcs11Id(
x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle()));
« no previous file with comments | « chrome/browser/chromeos/cros/certificate_pattern_matcher.cc ('k') | chrome/browser/chromeos/cros/network_library_impl_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698