Update from https://crrev.com/328418

base/vlog.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/vlog.h"
 
 #include <cstddef>
 #include <ostream>
 #include <utility>
 
@@ skipping 32 matching lines @@
 VlogInfo::VmodulePattern::VmodulePattern()
     : vlog_level(VlogInfo::kDefaultVlogLevel),
       match_target(MATCH_MODULE) {}
 
 VlogInfo::VlogInfo(const std::string& v_switch,
                    const std::string& vmodule_switch,
                    int* min_log_level)
     : 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)) {
       SetMaxVlogLevel(vlog_level);
     } else {
       DLOG(WARNING) << "Could not parse v switch \"" << 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)) {
       DLOG(WARNING) << "Parsed vlog level for \""
                     << it->first << "=" << it->second
                     << "\" as " << pattern.vlog_level;
     }
     vmodule_levels_.push_back(pattern);
   }
 }
@@ skipping 92 matching lines @@
     if (MatchVlogPattern(s, p))
       return true;
     s.remove_prefix(1);
   }
 
   // Otherwise, we couldn't find a match.
   return false;
 }
 
 }  // namespace logging