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

components/cronet/ios/cronet_environment.mm

 // Copyright 2016 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 "components/cronet/ios/cronet_environment.h"
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/atomicops.h"
@@ skipping 23 matching lines @@
 #include "net/dns/host_resolver.h"
 #include "net/dns/mapped_host_resolver.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/http_stream_factory.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
+#include "net/quic/core/quic_versions.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/url_request/http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "url/scheme_host_port.h"
 #include "url/url_util.h"
 
@@ skipping 264 matching lines @@
   // of changing it.
   [[NSHTTPCookieStorage sharedHTTPCookieStorage]
       setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
   std::unique_ptr<net::CookieStore> cookie_store =
       base::MakeUnique<net::CookieStoreIOS>(
           [NSHTTPCookieStorage sharedHTTPCookieStorage]);
   context_builder.SetCookieAndChannelIdStores(std::move(cookie_store), nullptr);
 
   std::unique_ptr<net::HttpServerProperties> http_server_properties(
       new net::HttpServerPropertiesImpl());
+  QuicVersionVector advertised_versions;
+  HttpNetworkSession::Params* params =
+      context_builder.GetNetworkSessionParams();
+  if (params) {
+    advertised_versions = params->quic_supported_versions;
+  } else {
+    advertised_versions = CurrentSupportedVersions();
+  }
+
   for (const auto& quic_hint : quic_hints_) {
     net::AlternativeService alternative_service(net::kProtoQUIC, "",
                                                 quic_hint.port());
     url::SchemeHostPort quic_hint_server("https", quic_hint.host(),
                                          quic_hint.port());
-    http_server_properties->SetAlternativeService(
-        quic_hint_server, alternative_service, base::Time::Max());
+    http_server_properties->SetQuicAlternativeService(

[Bence, 2017/06/16 14:43:40]

I believe this should also be called with an empty QuicVersionVector, because we
have no information about what versions the server support.

[Zhongyi Shi, 2017/06/20 23:23:37]

Acknowledged.

+        quic_hint_server, alternative_service, base::Time::Max(),
+        advertised_versions);
   }
 
   context_builder.SetHttpServerProperties(std::move(http_server_properties));
 
   main_context_ = context_builder.Build();
 }
 
 std::string CronetEnvironment::user_agent() {
   const net::HttpUserAgentSettings* user_agent_settings =
       main_context_->http_user_agent_settings();
@@ skipping 30 matching lines @@
   event->Signal();
 }
 
 std::string CronetEnvironment::getDefaultQuicUserAgentId() const {
   return base::SysNSStringToUTF8([[NSBundle mainBundle]
              objectForInfoDictionaryKey:@"CFBundleDisplayName"]) +
          " Cronet/" + CRONET_VERSION;
 }
 
 }  // namespace cronet