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

components/cronet/android/cronet_url_request_context_adapter.cc

 // Copyright 2014 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/android/cronet_url_request_context_adapter.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 46 matching lines @@
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_server_properties_manager.h"
 #include "net/log/file_net_log_observer.h"
 #include "net/log/net_log_util.h"
 #include "net/nqe/external_estimate_provider.h"
 #include "net/nqe/network_qualities_prefs_manager.h"
 #include "net/nqe/network_quality_estimator_params.h"
 #include "net/proxy/proxy_config_service_android.h"
 #include "net/proxy/proxy_service.h"
+#include "net/quic/core/quic_versions.h"
 #include "net/sdch/sdch_owner.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_interceptor.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
@@ skipping 680 matching lines @@
       if (quic_hint.alternate_port <= std::numeric_limits<uint16_t>::min() ||
           quic_hint.alternate_port > std::numeric_limits<uint16_t>::max()) {
         LOG(ERROR) << "Invalid QUIC hint alternate port: "
                    << quic_hint.alternate_port;
         continue;
       }
 
       url::SchemeHostPort quic_server("https", canon_host, quic_hint.port);
       net::AlternativeService alternative_service(
           net::kProtoQUIC, "", static_cast<uint16_t>(quic_hint.alternate_port));
+      QuicVersionVector advertised_versions;
+      HttpNetworkSession::Params* params = context_->GetNetworkSessionParams();
+      if (params) {
+        advertised_versions = params->quic_supported_versions;
+      } else {
+        advertised_versions = CurrentSupportedVersions();

[xunjieli, 2017/06/09 16:41:55]

suggestion for a follow-up:
Consider add a prefix/qualifier to CurrentSupportedVersion(). This static method
is in the global namespace. The name isn't specific enough.
e.g. quic_version::GetSupportedVersions()

[Zhongyi Shi, 2017/06/16 00:24:04]

Will do in a follow-up CL. Since this method is in the shared code. I will need
to add this in the internal code base first.

+      }
+
       context_->http_server_properties()->SetAlternativeService(
-          quic_server, alternative_service, base::Time::Max());
+          quic_server, alternative_service, base::Time::Max(),
+          advertised_versions);
     }
   }
 
   // If there is a cert_verifier, then populate its cache with
   // |cert_verifier_data|.
   if (!config->cert_verifier_data.empty() && context_->cert_verifier()) {
     SCOPED_UMA_HISTOGRAM_TIMER("Net.Cronet.CertVerifierCache.DeserializeTime");
     std::string data;
     cronet_pb::CertVerificationCache cert_verification_cache;
     if (base::Base64Decode(config->cert_verifier_data, &data) &&
@@ skipping 398 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jclass>& jcaller) {
   DCHECK(base::StatisticsRecorder::IsActive());
   std::vector<uint8_t> data;
   if (!HistogramManager::GetInstance()->GetDeltas(&data))
     return ScopedJavaLocalRef<jbyteArray>();
   return base::android::ToJavaByteArray(env, &data[0], data.size());
 }
 
 }  // namespace cronet