diff options
Diffstat (limited to 'chromeos/network')
| -rw-r--r-- | chromeos/network/network_change_notifier_chromeos.cc | 5 | ||||
| -rw-r--r-- | chromeos/network/onc/onc_validator.cc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chromeos/network/network_change_notifier_chromeos.cc b/chromeos/network/network_change_notifier_chromeos.cc index 52ee616..4561091 100644 --- a/chromeos/network/network_change_notifier_chromeos.cc +++ b/chromeos/network/network_change_notifier_chromeos.cc @@ -211,8 +211,9 @@ void NetworkChangeNotifierChromeos::UpdateState( NET_LOG_EVENT( "NCNDefaultDNSServerChanged", base::StringPrintf( - "%s -> %s", base::JoinString(dns_servers_, ",").c_str(), - base::JoinString(default_network->dns_servers(), ",").c_str())); + "%s -> %s", + JoinString(dns_servers_, ",").c_str(), + JoinString(default_network->dns_servers(), ",").c_str())); *dns_changed = true; } diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc index 4c2067a..4e2e732 100644 --- a/chromeos/network/onc/onc_validator.cc +++ b/chromeos/network/onc/onc_validator.cc @@ -325,7 +325,7 @@ std::string JoinStringRange(const std::vector<const char*>& strings, const std::string& separator) { std::vector<std::string> string_vector; std::copy(strings.begin(), strings.end(), std::back_inserter(string_vector)); - return base::JoinString(string_vector, separator); + return JoinString(string_vector, separator); } } // namespace @@ -952,7 +952,7 @@ bool Validator::ValidateCertificate(base::DictionaryValue* result) { } std::string Validator::MessageHeader() { - std::string path = path_.empty() ? "toplevel" : base::JoinString(path_, "."); + std::string path = path_.empty() ? "toplevel" : JoinString(path_, "."); std::string message = "At " + path + ": "; return message; } |