Use of base::StringPairs appropriately in cookies

net/cookies/cookie_util_unittest.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 <string>
 #include <utility>
 #include <vector>

[eroman, 2015/04/23 20:14:39]

can this be removed now?

 
 #include "base/basictypes.h"
+#include "base/strings/string_split.h"
 #include "net/cookies/cookie_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 struct RequestCookieParsingTest {
   std::string str;
-  std::vector<std::pair<std::string, std::string> > parsed;
+  base::StringPairs parsed;
 };
 
 net::cookie_util::ParsedRequestCookies MakeParsedRequestCookies(
-    const std::vector<std::pair<std::string, std::string> >& data) {
+    const base::StringPairs& data) {
   net::cookie_util::ParsedRequestCookies parsed;
   for (size_t i = 0; i < data.size(); i++) {
     parsed.push_back(std::make_pair(base::StringPiece(data[i].first),
                                     base::StringPiece(data[i].second)));
   }
   return parsed;
 }
 
-void CheckParse(
-    const std::string& str,
-    const std::vector<std::pair<std::string, std::string> >& parsed_expected) {
+void CheckParse(const std::string& str,
+                const base::StringPairs& parsed_expected) {
   net::cookie_util::ParsedRequestCookies parsed;
   net::cookie_util::ParseRequestCookieLine(str, &parsed);
   EXPECT_EQ(MakeParsedRequestCookies(parsed_expected), parsed);
 }
 
-void CheckSerialize(
-    const std::vector<std::pair<std::string, std::string> >& parsed,
-    const std::string& str_expected) {
+void CheckSerialize(const base::StringPairs& parsed,
+                    const std::string& str_expected) {
   net::cookie_util::ParsedRequestCookies prc =
       MakeParsedRequestCookies(parsed);
   EXPECT_EQ(str_expected, net::cookie_util::SerializeRequestCookieLine(prc));
 }
 
 TEST(CookieUtilTest, TestDomainIsHostOnly) {
   const struct {
     const char* str;
     const bool is_host_only;
   } tests[] = {
@@ skipping 151 matching lines @@
             net::cookie_util::GetEffectiveDomain("https", "www.example.com"));
   EXPECT_EQ("example.com",
             net::cookie_util::GetEffectiveDomain("ws", "www.example.com"));
   EXPECT_EQ("example.com",
             net::cookie_util::GetEffectiveDomain("wss", "www.example.com"));
   EXPECT_EQ("www.example.com",
             net::cookie_util::GetEffectiveDomain("ftp", "www.example.com"));
 }
 
 }  // namespace