Use of base::StringPairs appropriately in cookies

net/cookies/cookie_util_unittest.cc

Index: net/cookies/cookie_util_unittest.cc
diff --git a/net/cookies/cookie_util_unittest.cc b/net/cookies/cookie_util_unittest.cc
index 392faf122c1caef7a8ca0aa285e55f1fa4224130..ed1b94f5bb1faee70ecc52e4808d6089b157dc30 100644
--- a/net/cookies/cookie_util_unittest.cc
+++ b/net/cookies/cookie_util_unittest.cc
@@ -7,6 +7,7 @@
 #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"
 
@@ -14,11 +15,11 @@ 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),
@@ -27,17 +28,15 @@ net::cookie_util::ParsedRequestCookies MakeParsedRequestCookies(
   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));