Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/quic/quic_header_list_test.cc

Index: net/quic/quic_header_list_test.cc
diff --git a/net/quic/quic_header_list_test.cc b/net/quic/quic_header_list_test.cc
index bd4e560b57885042679a0a42767565863871fdbb..94f824972e7f7805640d5efd7f0fb1db05286518 100644
--- a/net/quic/quic_header_list_test.cc
+++ b/net/quic/quic_header_list_test.cc
@@ -16,11 +16,7 @@ TEST(QuicHeaderListTest, OnHeader) {
   headers.OnHeader("april", "fools");
   headers.OnHeader("beep", "");
 
-  std::string accumulator;
-  for (const auto& p : headers) {
-    accumulator.append("(" + p.first + ", " + p.second + ") ");
-  }
-  EXPECT_EQ("(foo, bar) (april, fools) (beep, ) ", accumulator);
+  EXPECT_EQ("{ foo=bar, april=fools, beep=, }", headers.DebugString());
 }
 
 // This test verifies that QuicHeaderList is copyable and assignable.
@@ -33,17 +29,8 @@ TEST(QuicHeaderListTest, IsCopyableAndAssignable) {
   QuicHeaderList headers2(headers);
   QuicHeaderList headers3 = headers;
 
-  std::string accumulator;
-  for (const auto& p : headers2) {
-    accumulator.append("(" + p.first + ", " + p.second + ") ");
-  }
-  EXPECT_EQ("(foo, bar) (april, fools) (beep, ) ", accumulator);
-
-  accumulator.clear();
-  for (const auto& p : headers3) {
-    accumulator.append("(" + p.first + ", " + p.second + ") ");
-  }
-  EXPECT_EQ("(foo, bar) (april, fools) (beep, ) ", accumulator);
+  EXPECT_EQ("{ foo=bar, april=fools, beep=, }", headers2.DebugString());
+  EXPECT_EQ("{ foo=bar, april=fools, beep=, }", headers3.DebugString());
 }
 
 }  // namespace net