Update from https://crrev.com/328418

base/vlog.cc

Index: base/vlog.cc
diff --git a/base/vlog.cc b/base/vlog.cc
index 8612071bb38fe671e65438c2a2d8f207c4f13a21..519ceff10c012455b18cd1e891e9590c969ad1ad 100644
--- a/base/vlog.cc
+++ b/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)) {