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

net/tools/quic/quic_in_memory_cache_test.cc

 // Copyright 2013 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 "base/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 92 matching lines @@
 }
 
 TEST_F(QuicInMemoryCacheTest, ReadsCacheDir) {
   QuicInMemoryCache::GetInstance()->InitializeFromDirectory(CacheDirectory());
   const QuicInMemoryCache::Response* response =
       QuicInMemoryCache::GetInstance()->GetResponse("quic.test.url",
                                                     "/index.html");
   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());
 }
 
 TEST_F(QuicInMemoryCacheTest, ReadsCacheDirWithServerPushResource) {
   QuicInMemoryCache::GetInstance()->InitializeFromDirectory(CacheDirectory() +
                                                             "_with_push");
   QuicInMemoryCache* cache = QuicInMemoryCache::GetInstance();
   list<ServerPushInfo> resources =
       cache->GetServerPushResources("quic.test.url/");
   ASSERT_EQ(1UL, resources.size());
 }
 
 TEST_F(QuicInMemoryCacheTest, ReadsCacheDirWithServerPushResources) {
   QuicInMemoryCache::GetInstance()->InitializeFromDirectory(CacheDirectory() +
                                                             "_with_push");
   QuicInMemoryCache* cache = QuicInMemoryCache::GetInstance();
   list<ServerPushInfo> resources =
       cache->GetServerPushResources("quic.test.url/index2.html");
   ASSERT_EQ(2UL, resources.size());
 }
 
 TEST_F(QuicInMemoryCacheTest, UsesOriginalUrl) {
   QuicInMemoryCache::GetInstance()->InitializeFromDirectory(CacheDirectory());
   const QuicInMemoryCache::Response* response =
       QuicInMemoryCache::GetInstance()->GetResponse("quic.test.url",
                                                     "/index.html");
   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());
 }
 
 TEST_F(QuicInMemoryCacheTest, DefaultResponse) {
   // Verify GetResponse returns nullptr when no default is set.
   QuicInMemoryCache* cache = QuicInMemoryCache::GetInstance();
   const QuicInMemoryCache::Response* response =
       cache->GetResponse("www.google.com", "/");
   ASSERT_FALSE(response);
 
@@ skipping 98 matching lines @@
     ASSERT_TRUE(ContainsKey(response->headers(), ":status"));
     EXPECT_EQ(push_response_status[i++],
               response->headers().find(":status")->second);
     EXPECT_EQ(push_resource.body, response->body());
     resources.pop_front();
   }
 }
 
 }  // namespace test
 }  // namespace net