Use of base::StringPairs appropriately in content

content/renderer/p2p/port_allocator.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 "content/renderer/p2p/port_allocator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 184 matching lines @@
   request.addHTTPHeaderField(
       WebString::fromUTF8("X-Google-Relay-Auth"),
       WebString::fromUTF8(relay_config.username));
   request.addHTTPHeaderField(WebString::fromUTF8("X-Stream-Type"),
                              WebString::fromUTF8("chromoting"));
 
   relay_session_request_->loadAsynchronously(request, this);
 }
 
 void P2PPortAllocatorSession::ParseRelayResponse() {
-  std::vector<std::pair<std::string, std::string> > value_pairs;
+  //std::vector<std::pair<std::string, std::string> > value_pairs;

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

remove

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

Done.

+  base::StringPairs value_pairs;
   if (!base::SplitStringIntoKeyValuePairs(relay_session_response_, '=', '\n',
                                           &value_pairs)) {
     LOG(ERROR) << "Received invalid response from relay server";
     return;
   }
 
   relay_ip_.Clear();
   relay_udp_port_ = 0;
   relay_tcp_port_ = 0;
   relay_ssltcp_port_ = 0;
 
-  for (std::vector<std::pair<std::string, std::string> >::iterator
+  //for (std::vector<std::pair<std::string, std::string> >::iterator

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

remove

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

Done.

+  for (base::StringPairs::iterator
            it = value_pairs.begin();

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

combine lines

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

Done.

        it != value_pairs.end(); ++it) {
     std::string key;
     std::string value;
     base::TrimWhitespaceASCII(it->first, base::TRIM_ALL, &key);
     base::TrimWhitespaceASCII(it->second, base::TRIM_ALL, &value);
 
     if (key == "username") {
       if (value != username()) {
         LOG(ERROR) << "When creating relay session received user name "
             " that was different from the value specified in the query.";
@@ skipping 51 matching lines @@
                                  config.relays[i].port),
         protocol,
         config.relays[i].secure));
     relay_server.credentials = credentials;
     port_config->AddRelay(relay_server);
   }
   ConfigReady(port_config);
 }
 
 }  // namespace content