diff options
Diffstat (limited to 'chromium/base/vlog.cc')
| -rw-r--r-- | chromium/base/vlog.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/base/vlog.cc b/chromium/base/vlog.cc index 434a70e0917..519ceff10c0 100644 --- a/chromium/base/vlog.cc +++ b/chromium/base/vlog.cc @@ -50,7 +50,6 @@ VlogInfo::VlogInfo(const std::string& v_switch, : min_log_level_(min_log_level) { DCHECK(min_log_level != NULL); - typedef std::pair<std::string, std::string> KVPair; int vlog_level = 0; if (!v_switch.empty()) { if (base::StringToInt(v_switch, &vlog_level)) { @@ -60,13 +59,13 @@ VlogInfo::VlogInfo(const std::string& v_switch, } } - std::vector<KVPair> kv_pairs; + base::StringPairs kv_pairs; if (!base::SplitStringIntoKeyValuePairs( vmodule_switch, '=', ',', &kv_pairs)) { DLOG(WARNING) << "Could not fully parse vmodule switch \"" << vmodule_switch << "\""; } - for (std::vector<KVPair>::const_iterator it = kv_pairs.begin(); + for (base::StringPairs::const_iterator it = kv_pairs.begin(); it != kv_pairs.end(); ++it) { VmodulePattern pattern(it->first); if (!base::StringToInt(it->second, &pattern.vlog_level)) { @@ -178,4 +177,4 @@ bool MatchVlogPattern(const base::StringPiece& string, return false; } -} // namespace +} // namespace logging |