Use of base::StringPairs appropriately in content

content/browser/transition_request_manager.cc

 // Copyright 2014 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 "content/browser/transition_request_manager.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/field_trial.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 
 namespace {
 
 // Enumerate all Link: headers with the specified relation in this
 // response, and optionally returns the URL and any additional attributes of
 // each one. See EnumerateHeaders for |iter| usage.
 bool EnumerateLinkHeaders(
     const scoped_refptr<net::HttpResponseHeaders>& headers,
     void** iter,
     const std::string& rel,
     std::string* url,
-    std::vector<std::pair<std::string, std::string> >* attributes) {
+    base::StringPairs* attributes) {
   std::string header_body;
   bool rel_matched = false;
   while (!rel_matched && headers->EnumerateHeader(iter, "link", &header_body)) {
     const std::string::const_iterator begin = header_body.begin();
     size_t url_start = header_body.find_first_of('<');
     size_t url_end = header_body.find_first_of('>');
     if (url_start == std::string::npos || url_end == std::string::npos ||
         url_start > url_end) {
       break;
     }
@@ skipping 45 matching lines @@
 }
 
 void TransitionRequestManager::ParseTransitionStylesheetsFromHeaders(
     const scoped_refptr<net::HttpResponseHeaders>& headers,
     std::vector<GURL>& entering_stylesheets,
     const GURL& resolve_address) {
   if (headers.get() == NULL)
     return;
 
   std::string transition_stylesheet;
-  std::vector<std::pair<std::string, std::string> > attributes;
+  base::StringPairs attributes;
+  //std::vector<std::pair<std::string, std::string> > attributes;

[Avi (use Gerrit), 2014/09/25 04:59:15]

Do not commit commented-out lines.

[MRV, 2014/09/25 05:15:28]

Done.

   void* header_iter = NULL;
   while (EnumerateLinkHeaders(headers,
                               &header_iter,
                               "transition-entering-stylesheet",
                               &transition_stylesheet,
                               &attributes)) {
     GURL stylesheet_url = resolve_address.Resolve(transition_stylesheet);
     if (stylesheet_url.is_valid())
       entering_stylesheets.push_back(stylesheet_url);
   }
@@ skipping 72 matching lines @@
 
 TransitionRequestManager::~TransitionRequestManager() {
 }
 
 // static
 TransitionRequestManager* TransitionRequestManager::GetInstance() {
   return Singleton<TransitionRequestManager>::get();
 }
 
 }  // namespace content