Add and persist a new field in AlternativeServiceInfo to list QUIC verisons advertised

net/http/http_server_properties_impl_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 "net/http/http_server_properties_impl.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_address.h"
+#include "net/http/http_network_session.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace base {
 class ListValue;
 }
 
 namespace net {
 
 class HttpServerPropertiesImplPeer {
@@ skipping 28 matching lines @@
   bool HasAlternativeService(const url::SchemeHostPort& origin) {
     const AlternativeServiceInfoVector alternative_service_info_vector =
         impl_.GetAlternativeServiceInfos(origin);
     return !alternative_service_info_vector.empty();
   }
 
   bool SetAlternativeService(const url::SchemeHostPort& origin,
                              const AlternativeService& alternative_service) {
     const base::Time expiration =
         base::Time::Now() + base::TimeDelta::FromDays(1);
-    return impl_.SetAlternativeService(origin, alternative_service, expiration);
+    return impl_.SetAlternativeService(
+        origin, alternative_service, expiration,
+        HttpNetworkSession::Params().quic_supported_versions);
   }
 
   HttpServerPropertiesImpl impl_;
 };
 
 typedef HttpServerPropertiesImplTest SpdyServerPropertiesTest;
 
 TEST_F(SpdyServerPropertiesTest, SetWithSchemeHostPort) {
   // Check spdy servers are correctly set with SchemeHostPort key.
   url::SchemeHostPort https_www_server("https", "www.google.com", 443);
@@ skipping 283 matching lines @@
             alternative_service_info_vector[0].alternative_service);
 
   impl_.Clear();
   EXPECT_FALSE(HasAlternativeService(test_server));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ExcludeOrigin) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   // Same hostname, same port, TCP: should be ignored.
-  AlternativeServiceInfo alternative_service_info1(kProtoHTTP2, "foo", 443,
-                                                   expiration);
+  AlternativeServiceInfo alternative_service_info1(
+      AlternativeService(kProtoHTTP2, "foo", 443), expiration,
+      HttpNetworkSession::Params().quic_supported_versions);
   alternative_service_info_vector.push_back(alternative_service_info1);
   // Different hostname: GetAlternativeServiceInfos should return this one.
-  AlternativeServiceInfo alternative_service_info2(kProtoHTTP2, "bar", 443,
-                                                   expiration);
+  AlternativeServiceInfo alternative_service_info2(
+      AlternativeService(kProtoHTTP2, "bar", 443), expiration,
+      HttpNetworkSession::Params().quic_supported_versions);
   alternative_service_info_vector.push_back(alternative_service_info2);
   // Different port: GetAlternativeServiceInfos should return this one too.
-  AlternativeServiceInfo alternative_service_info3(kProtoHTTP2, "foo", 80,
-                                                   expiration);
+  AlternativeServiceInfo alternative_service_info3(
+      AlternativeService(kProtoHTTP2, "foo", 80), expiration,
+      HttpNetworkSession::Params().quic_supported_versions);
   alternative_service_info_vector.push_back(alternative_service_info3);
   // QUIC: GetAlternativeServices should return this one too.
-  AlternativeServiceInfo alternative_service_info4(kProtoQUIC, "foo", 443,
-                                                   expiration);
+  AlternativeServiceInfo alternative_service_info4(
+      AlternativeService(kProtoQUIC, "foo", 443), expiration,
+      HttpNetworkSession::Params().quic_supported_versions);
   alternative_service_info_vector.push_back(alternative_service_info4);
 
   url::SchemeHostPort test_server("https", "foo", 443);
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
 
   const AlternativeServiceInfoVector alternative_service_info_vector2 =
       impl_.GetAlternativeServiceInfos(test_server);
   ASSERT_EQ(3u, alternative_service_info_vector2.size());
   EXPECT_EQ(alternative_service_info2, alternative_service_info_vector2[0]);
   EXPECT_EQ(alternative_service_info3, alternative_service_info_vector2[1]);
   EXPECT_EQ(alternative_service_info4, alternative_service_info_vector2[2]);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, Set) {
   // |test_server1| has an alternative service, which will not be
   // affected by SetAlternativeServiceServers(), because
   // |alternative_service_map| does not have an entry for
   // |test_server1|.
   url::SchemeHostPort test_server1("http", "foo1", 80);
   const AlternativeService alternative_service1(kProtoHTTP2, "bar1", 443);
   const base::Time now = base::Time::Now();
   base::Time expiration1 = now + base::TimeDelta::FromDays(1);
   // 1st entry in the memory.
-  impl_.SetAlternativeService(test_server1, alternative_service1, expiration1);
+  impl_.SetAlternativeService(
+      test_server1, alternative_service1, expiration1,
+      HttpNetworkSession::Params().quic_supported_versions);
 
   // |test_server2| has an alternative service, which will be
   // overwritten by SetAlternativeServiceServers(), because
   // |alternative_service_map| has an entry for
   // |test_server2|.
   AlternativeServiceInfoVector alternative_service_info_vector;
   const AlternativeService alternative_service2(kProtoHTTP2, "bar2", 443);
   base::Time expiration2 = now + base::TimeDelta::FromDays(2);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service2, expiration2));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service2, expiration2,
+      HttpNetworkSession::Params().quic_supported_versions));
   url::SchemeHostPort test_server2("http", "foo2", 80);
   // 0th entry in the memory.
   impl_.SetAlternativeServices(test_server2, alternative_service_info_vector);
 
   // Prepare |alternative_service_map| to be loaded by
   // SetAlternativeServiceServers().
   AlternativeServiceMap alternative_service_map(
       AlternativeServiceMap::NO_AUTO_EVICT);
   const AlternativeService alternative_service3(kProtoHTTP2, "bar3", 123);
   base::Time expiration3 = now + base::TimeDelta::FromDays(3);
-  const AlternativeServiceInfo alternative_service_info1(alternative_service3,
-                                                         expiration3);
+  const AlternativeServiceInfo alternative_service_info1(
+      alternative_service3, expiration3,
+      HttpNetworkSession::Params().quic_supported_versions);
   // Simulate updating data for 0th entry with data from Preferences.
   alternative_service_map.Put(
       test_server2,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info1));
 
   url::SchemeHostPort test_server3("http", "foo3", 80);
   const AlternativeService alternative_service4(kProtoHTTP2, "bar4", 1234);
   base::Time expiration4 = now + base::TimeDelta::FromDays(4);
-  const AlternativeServiceInfo alternative_service_info2(alternative_service4,
-                                                         expiration4);
+  const AlternativeServiceInfo alternative_service_info2(
+      alternative_service4, expiration4,
+      HttpNetworkSession::Params().quic_supported_versions);
   // Add an old entry from Preferences, this will be added to end of recency
   // list.
   alternative_service_map.Put(
       test_server3,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info2));
 
   // MRU list will be test_server2, test_server1, test_server3.
   impl_.SetAlternativeServiceServers(&alternative_service_map);
 
   // Verify alternative_service_map.
@@ skipping 42 matching lines @@
             alternative_service_info_vector[0].alternative_service);
 }
 
 // Regression test for https://crbug.com/516486:
 // GetAlternativeServiceInfos() should remove |alternative_service_map_|
 // elements with empty value.
 TEST_F(AlternateProtocolServerPropertiesTest, EmptyVector) {
   url::SchemeHostPort server("https", "foo", 443);
   const AlternativeService alternative_service(kProtoHTTP2, "bar", 443);
   base::Time expiration = base::Time::Now() - base::TimeDelta::FromDays(1);
-  const AlternativeServiceInfo alternative_service_info(alternative_service,
-                                                        expiration);
+  const AlternativeServiceInfo alternative_service_info(
+      alternative_service, expiration,
+      HttpNetworkSession::Params().quic_supported_versions);
   AlternativeServiceMap alternative_service_map(
       AlternativeServiceMap::NO_AUTO_EVICT);
   alternative_service_map.Put(
       server,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
 
   // Prepare |alternative_service_map_| with a single key that has a single
   // AlternativeServiceInfo with identical hostname and port.
   impl_.SetAlternativeServiceServers(&alternative_service_map);
 
@@ skipping 11 matching lines @@
   // There should still be no alternative service assigned to |server|.
   ASSERT_TRUE(impl_.GetAlternativeServiceInfos(server).empty());
 }
 
 // Regression test for https://crbug.com/516486 for the canonical host case.
 TEST_F(AlternateProtocolServerPropertiesTest, EmptyVectorForCanonical) {
   url::SchemeHostPort server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
   const AlternativeService alternative_service(kProtoHTTP2, "", 443);
   base::Time expiration = base::Time::Now() - base::TimeDelta::FromDays(1);
-  const AlternativeServiceInfo alternative_service_info(alternative_service,
-                                                        expiration);
+  const AlternativeServiceInfo alternative_service_info(
+      alternative_service, expiration,
+      HttpNetworkSession::Params().quic_supported_versions);
   AlternativeServiceMap alternative_service_map(
       AlternativeServiceMap::NO_AUTO_EVICT);
   alternative_service_map.Put(
       canonical_server,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
 
   // Prepare |alternative_service_map_| with a single key that has a single
   // AlternativeServiceInfo with identical hostname and port.
   impl_.SetAlternativeServiceServers(&alternative_service_map);
 
@@ skipping 12 matching lines @@
   // There should still be no alternative service assigned to
   // |canonical_server|.
   ASSERT_TRUE(impl_.GetAlternativeServiceInfos(canonical_server).empty());
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearServerWithCanonical) {
   url::SchemeHostPort server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
   const AlternativeService alternative_service(kProtoQUIC, "", 443);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
-  const AlternativeServiceInfo alternative_service_info(alternative_service,
-                                                        expiration);
+  const AlternativeServiceInfo alternative_service_info(
+      alternative_service, expiration,
+      HttpNetworkSession::Params().quic_supported_versions);
 
   impl_.SetAlternativeServices(
       canonical_server,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
 
   // Make sure the canonical service is returned for the other server.
   const AlternativeServiceInfoVector alternative_service_info_vector =
       impl_.GetAlternativeServiceInfos(server);
   ASSERT_EQ(1u, alternative_service_info_vector.size());
   EXPECT_EQ(kProtoQUIC,
@@ skipping 52 matching lines @@
   alternative_service_info_vector =
       impl_.GetAlternativeServiceInfos(test_server);
   ASSERT_EQ(1u, alternative_service_info_vector.size());
   EXPECT_EQ(alternative_service1,
             alternative_service_info_vector[0].alternative_service);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
 
   // SetAlternativeServices should add a broken alternative service to the map.
   AlternativeServiceInfoVector alternative_service_info_vector2;
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
-  alternative_service_info_vector2.push_back(
-      AlternativeServiceInfo(alternative_service1, expiration));
+
+  alternative_service_info_vector2.push_back(AlternativeServiceInfo(
+      alternative_service1, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   const AlternativeService alternative_service2(kProtoHTTP2, "foo", 1234);
-  alternative_service_info_vector2.push_back(
-      AlternativeServiceInfo(alternative_service2, expiration));
+  alternative_service_info_vector2.push_back(AlternativeServiceInfo(
+      alternative_service2, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector2);
   alternative_service_info_vector =
       impl_.GetAlternativeServiceInfos(test_server);
   ASSERT_EQ(2u, alternative_service_info_vector.size());
   EXPECT_EQ(alternative_service1,
             alternative_service_info_vector[0].alternative_service);
   EXPECT_EQ(alternative_service2,
             alternative_service_info_vector[1].alternative_service);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service2));
 
   // SetAlternativeService should add a broken alternative service to the map.
   SetAlternativeService(test_server, alternative_service1);
   alternative_service_info_vector =
       impl_.GetAlternativeServiceInfos(test_server);
   ASSERT_EQ(1u, alternative_service_info_vector.size());
   EXPECT_EQ(alternative_service1,
             alternative_service_info_vector[0].alternative_service);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MaxAge) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   base::Time now = base::Time::Now();
   base::TimeDelta one_day = base::TimeDelta::FromDays(1);
 
   // First alternative service expired one day ago, should not be returned by
   // GetAlternativeServiceInfos().
   const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service1, now - one_day));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service1, now - one_day,
+      HttpNetworkSession::Params().quic_supported_versions));
 
   // Second alterrnative service will expire one day from now, should be
   // returned by GetAlternativeSerices().
   const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service2, now + one_day));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service2, now + one_day,
+      HttpNetworkSession::Params().quic_supported_versions));
 
   url::SchemeHostPort test_server("http", "foo", 80);
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
 
   AlternativeServiceInfoVector alternative_service_info_vector2 =
       impl_.GetAlternativeServiceInfos(test_server);
   ASSERT_EQ(1u, alternative_service_info_vector2.size());
   EXPECT_EQ(alternative_service2,
             alternative_service_info_vector2[0].alternative_service);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MaxAgeCanonical) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   base::Time now = base::Time::Now();
   base::TimeDelta one_day = base::TimeDelta::FromDays(1);
 
   // First alternative service expired one day ago, should not be returned by
   // GetAlternativeServiceInfos().
   const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service1, now - one_day));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service1, now - one_day,
+      HttpNetworkSession::Params().quic_supported_versions));
 
   // Second alterrnative service will expire one day from now, should be
   // returned by GetAlternativeSerices().
   const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service2, now + one_day));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service2, now + one_day,
+      HttpNetworkSession::Params().quic_supported_versions));
 
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
   impl_.SetAlternativeServices(canonical_server,
                                alternative_service_info_vector);
 
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   AlternativeServiceInfoVector alternative_service_info_vector2 =
       impl_.GetAlternativeServiceInfos(test_server);
   ASSERT_EQ(1u, alternative_service_info_vector2.size());
   EXPECT_EQ(alternative_service2,
             alternative_service_info_vector2[0].alternative_service);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, AlternativeServiceWithScheme) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service1, expiration));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service1, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service2, expiration));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service2, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   // Set Alt-Svc list for |http_server|.
   url::SchemeHostPort http_server("http", "foo", 80);
   impl_.SetAlternativeServices(http_server, alternative_service_info_vector);
 
   const net::AlternativeServiceMap& map = impl_.alternative_service_map();
   net::AlternativeServiceMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(http_server));
   ASSERT_EQ(2u, it->second.size());
   EXPECT_EQ(alternative_service1, it->second[0].alternative_service);
   EXPECT_EQ(alternative_service2, it->second[1].alternative_service);
@@ skipping 11 matching lines @@
   impl_.SetAlternativeServices(http_server, AlternativeServiceInfoVector());
 
   EXPECT_EQ(0u, impl_.GetAlternativeServiceInfos(http_server).size());
   EXPECT_EQ(2u, impl_.GetAlternativeServiceInfos(https_server).size());
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearAlternativeServices) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service1, expiration));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service1, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(alternative_service2, expiration));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      alternative_service2, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   url::SchemeHostPort test_server("http", "foo", 80);
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
 
   const net::AlternativeServiceMap& map = impl_.alternative_service_map();
   net::AlternativeServiceMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(test_server));
   ASSERT_EQ(2u, it->second.size());
   EXPECT_EQ(alternative_service1, it->second[0].alternative_service);
   EXPECT_EQ(alternative_service2, it->second[1].alternative_service);
 
@@ skipping 64 matching lines @@
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   EXPECT_FALSE(HasAlternativeService(test_server));
 
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
   EXPECT_FALSE(HasAlternativeService(canonical_server));
 
   AlternativeServiceInfoVector alternative_service_info_vector;
   const AlternativeService canonical_alternative_service1(
       kProtoQUIC, "bar.c.youtube.com", 1234);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(canonical_alternative_service1, expiration));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      canonical_alternative_service1, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   const AlternativeService canonical_alternative_service2(kProtoHTTP2, "", 443);
-  alternative_service_info_vector.push_back(
-      AlternativeServiceInfo(canonical_alternative_service2, expiration));
+  alternative_service_info_vector.push_back(AlternativeServiceInfo(
+      canonical_alternative_service2, expiration,
+      HttpNetworkSession::Params().quic_supported_versions));
   impl_.SetAlternativeServices(canonical_server,
                                alternative_service_info_vector);
 
   // Since |test_server| does not have an alternative service itself,
   // GetAlternativeServiceInfos should return those of |canonical_server|.
   AlternativeServiceInfoVector alternative_service_info_vector2 =
       impl_.GetAlternativeServiceInfos(test_server);
   ASSERT_EQ(2u, alternative_service_info_vector2.size());
   EXPECT_EQ(canonical_alternative_service1,
             alternative_service_info_vector2[0].alternative_service);
@@ skipping 373 matching lines @@
   EXPECT_EQ(quic_server_info1, *(impl_.GetQuicServerInfo(quic_server_id)));
 
   impl_.Clear();
   EXPECT_EQ(0u, impl_.quic_server_info_map().size());
   EXPECT_EQ(nullptr, impl_.GetQuicServerInfo(quic_server_id));
 }
 
 }  // namespace
 
 }  // namespace net