diff options
author | mef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 08:21:23 +0000 |
---|---|---|
committer | mef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 08:21:23 +0000 |
commit | d0f6d663009fed0f2737e1551f10ee9edf05c192 (patch) | |
tree | 43ccffb24d26fc7f0e0ac6de8ba74d1c74218350 /chromeos/network/client_cert_resolver.cc | |
parent | 503fd3f68383e21fedc0ea8d573add7bdfd5a31c (diff) | |
download | chromium_src-d0f6d663009fed0f2737e1551f10ee9edf05c192.zip chromium_src-d0f6d663009fed0f2737e1551f10ee9edf05c192.tar.gz chromium_src-d0f6d663009fed0f2737e1551f10ee9edf05c192.tar.bz2 |
Moved onc_constants.* from chromeos/network/onc to components/onc.
BUG=267667
Review URL: https://codereview.chromium.org/24600003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/client_cert_resolver.cc')
-rw-r--r-- | chromeos/network/client_cert_resolver.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromeos/network/client_cert_resolver.cc b/chromeos/network/client_cert_resolver.cc index 998f75a..72c97c5 100644 --- a/chromeos/network/client_cert_resolver.cc +++ b/chromeos/network/client_cert_resolver.cc @@ -24,7 +24,7 @@ #include "chromeos/network/managed_network_configuration_handler.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/network/network_ui_data.h" -#include "chromeos/network/onc/onc_constants.h" +#include "components/onc/onc_constants.h" #include "dbus/object_path.h" #include "net/cert/x509_certificate.h" @@ -100,7 +100,7 @@ struct NetworkAndCertPattern { // A unary predicate that returns true if the given CertAndIssuer matches the // certificate pattern of the NetworkAndCertPattern. struct MatchCertWithPattern { - MatchCertWithPattern(const NetworkAndCertPattern& pattern) + explicit MatchCertWithPattern(const NetworkAndCertPattern& pattern) : net_and_pattern(pattern) {} bool operator()(const CertAndIssuer& cert_and_issuer) { @@ -192,7 +192,7 @@ void FindCertificateMatches(const net::CertificateList& certs, // pattern within an EAP, IPsec or OpenVPN configuration. client_cert::ConfigType OncToClientCertConfigurationType( const base::DictionaryValue& network_config) { - using namespace ::chromeos::onc; + using namespace ::onc; const base::DictionaryValue* wifi = NULL; network_config.GetDictionaryWithoutPathExpansion(network_config::kWiFi, @@ -247,7 +247,7 @@ void LogError(const std::string& service_path, } bool ClientCertificatesLoaded() { - if(!CertLoader::Get()->certificates_loaded()) { + if (!CertLoader::Get()->certificates_loaded()) { VLOG(1) << "Certificates not loaded yet."; return false; } |