Update from https://crrev.com/328418

base/process/internal_linux.cc

 // Copyright (c) 2012 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/process/internal_linux.h"
 
 #include <unistd.h>
 
 #include <map>
 #include <string>
@@ skipping 88 matching lines @@
   // Split the rest.
   std::vector<std::string> other_stats;
   SplitString(stats_data.substr(close_parens_idx + 2), ' ', &other_stats);
   for (size_t i = 0; i < other_stats.size(); ++i)
     proc_stats->push_back(other_stats[i]);
   return true;
 }
 
 typedef std::map<std::string, std::string> ProcStatMap;
 void ParseProcStat(const std::string& contents, ProcStatMap* output) {
-  typedef std::pair<std::string, std::string> StringPair;
-  std::vector<StringPair> key_value_pairs;
+  base::StringPairs key_value_pairs;
   SplitStringIntoKeyValuePairs(contents, ' ', '\n', &key_value_pairs);
   for (size_t i = 0; i < key_value_pairs.size(); ++i) {
-    const StringPair& key_value_pair = key_value_pairs[i];
-    output->insert(key_value_pair);
+    output->insert(key_value_pairs[i]);
   }
 }
 
 int64 GetProcStatsFieldAsInt64(const std::vector<std::string>& proc_stats,
                                ProcStatsFields field_num) {
   DCHECK_GE(field_num, VM_PPID);
   CHECK_LT(static_cast<size_t>(field_num), proc_stats.size());
 
   int64 value;
   return StringToInt64(proc_stats[field_num], &value) ? value : 0;
@@ skipping 55 matching lines @@
   // which means the answer is 100.
   // It may be the case that this value is always 100.
   static const int kHertz = sysconf(_SC_CLK_TCK);
 
   return TimeDelta::FromMicroseconds(
       Time::kMicrosecondsPerSecond * clock_ticks / kHertz);
 }
 
 }  // namespace internal
 }  // namespace base