Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/tools/quic/quic_in_memory_cache_test.cc

Index: net/tools/quic/quic_in_memory_cache_test.cc
diff --git a/net/tools/quic/quic_in_memory_cache_test.cc b/net/tools/quic/quic_in_memory_cache_test.cc
index 249f6618f98abd91e5d71c1518512881273adad8..d26f533c55b823f68915ae464c2a17f2233647b2 100644
--- a/net/tools/quic/quic_in_memory_cache_test.cc
+++ b/net/tools/quic/quic_in_memory_cache_test.cc
@@ -110,7 +110,8 @@ TEST_F(QuicInMemoryCacheTest, ReadsCacheDir) {
   ASSERT_TRUE(response);
   ASSERT_TRUE(ContainsKey(response->headers(), ":status"));
   EXPECT_EQ("200", response->headers().find(":status")->second);
-  ASSERT_FALSE(ContainsKey(response->headers(), "connection"));
+  // Connection headers are not valid in HTTP/2.
+  EXPECT_FALSE(ContainsKey(response->headers(), "connection"));
   EXPECT_LT(0U, response->body().length());
 }
 
@@ -140,7 +141,8 @@ TEST_F(QuicInMemoryCacheTest, UsesOriginalUrl) {
   ASSERT_TRUE(response);
   ASSERT_TRUE(ContainsKey(response->headers(), ":status"));
   EXPECT_EQ("200", response->headers().find(":status")->second);
-  ASSERT_FALSE(ContainsKey(response->headers(), "connection"));
+  // Connection headers are not valid in HTTP/2.
+  EXPECT_FALSE(ContainsKey(response->headers(), "connection"));
   EXPECT_LT(0U, response->body().length());
 }