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/test/test_mock_time_task_runner.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 {
 
 const base::TimeDelta BROKEN_ALT_SVC_EXPIRE_DELAYS[10] = {
@@ skipping 45 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);
   }
 
   void MarkBrokenAndLetExpireAlternativeServiceNTimes(
       const AlternativeService& alternative_service,
       int num_times) {}
 
   scoped_refptr<base::TestMockTimeTaskRunner> test_task_runner_;
 
   std::unique_ptr<base::TickClock> broken_services_clock_;
   HttpServerPropertiesImpl impl_;
@@ skipping 290 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);
   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);
   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);
   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);
   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);

[Ryan Hamilton, 2017/06/07 20:52:23]

For tests, I'd just use QuicSupportedVersions()?

[Zhongyi Shi, 2017/06/08 23:11:16]

Fixed. We should use an empty version vector actually since we are setting a H2
alt svc.

 
   // |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));
@@ skipping 888 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