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

net/http/http_server_properties_impl_unittest.cc

Index: net/http/http_server_properties_impl_unittest.cc
diff --git a/net/http/http_server_properties_impl_unittest.cc b/net/http/http_server_properties_impl_unittest.cc
index 18edad7b91476d00a0a108cf99903fb297cda57f..b7e74f62e2db9bec119486c54f89ca5a0b9c5358 100644
--- a/net/http/http_server_properties_impl_unittest.cc
+++ b/net/http/http_server_properties_impl_unittest.cc
@@ -12,6 +12,7 @@
 #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"
 
@@ -364,20 +365,20 @@ 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);
@@ -637,6 +638,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, SetBroken) {
   // 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);
+

[Ryan Hamilton, 2017/05/25 22:01:45]

nit: remove

[Zhongyi Shi, 2017/06/06 22:04:52]

Done.

   alternative_service_info_vector2.push_back(
       AlternativeServiceInfo(alternative_service1, expiration));
   const AlternativeService alternative_service2(kProtoHTTP2, "foo", 1234);