Use base::StringPairs together with SplitStringIntoKeyValuePairs

chrome/browser/ui/webui/fileicon_source.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 "chrome/browser/ui/webui/fileicon_source.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 45 matching lines @@
   if (size_string == "large") return IconLoader::LARGE;
   // We default to NORMAL if we don't recognize the size_string. Including
   // size_string=="normal".
   return IconLoader::NORMAL;
 }
 
 // Simple parser for data on the query.
 void ParseQueryParams(const std::string& query,
                       float* scale_factor,
                       IconLoader::IconSize* icon_size) {
-  typedef std::pair<std::string, std::string> KVPair;
-  std::vector<KVPair> parameters;
+  base::StringPairs parameters;
   if (icon_size)
     *icon_size = IconLoader::NORMAL;
   if (scale_factor)
     *scale_factor = 1.0f;
   base::SplitStringIntoKeyValuePairs(query, '=', '&', &parameters);
-  for (std::vector<KVPair>::const_iterator iter = parameters.begin();
+  for (base::StringPairs::const_iterator iter = parameters.begin();
        iter != parameters.end(); ++iter) {
     if (icon_size && iter->first == kIconSize)
       *icon_size = SizeStringToIconSize(iter->second);
     else if (scale_factor && iter->first == kScaleFactor)
       webui::ParseScaleFactor(iter->second, scale_factor);
   }
 }
 
 }  // namespace
 
@@ skipping 70 matching lines @@
             details.scale_factor).sk_bitmap(),
         false,
         &icon_data->data());
 
     details.callback.Run(icon_data.get());
   } else {
     // TODO(glen): send a dummy icon.
     details.callback.Run(NULL);
   }
 }