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

net/spdy/chromium/spdy_session.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/spdy/chromium/spdy_session.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 3006 matching lines @@
   DCHECK(!quic_supported_versions_.empty());
   for (const SpdyAltSvcWireFormat::AlternativeService& altsvc : altsvc_vector) {
     const NextProto protocol = NextProtoFromString(altsvc.protocol_id);
     if (protocol == kProtoUnknown)
       continue;
 
     // TODO(zhongyi): refactor the QUIC version filtering to a single function
     // so that SpdySession::OnAltSvc and
     // HttpStreamFactory::ProcessAlternativeServices
     // could use the the same function.
-    // Check if QUIC version is supported.
+    // Check if QUIC version is supported. Filter supported QUIC versions.
+    QuicVersionVector advertised_versions;
     if (protocol == kProtoQUIC && !altsvc.version.empty()) {
       bool match_found = false;
       for (const QuicVersion& supported : quic_supported_versions_) {
         for (const uint16_t& advertised : altsvc.version) {
           if (supported == advertised) {
             match_found = true;
-            break;
+            advertised_versions.push_back(supported);
           }
         }
-        if (match_found) {
-          break;
-        }
       }
       if (!match_found) {
         continue;
       }
     }
 
     const AlternativeService alternative_service(protocol, altsvc.host,
                                                  altsvc.port);
     const base::Time expiration =
         now + base::TimeDelta::FromSeconds(altsvc.max_age);
-    alternative_service_info_vector.push_back(
-        AlternativeServiceInfo(alternative_service, expiration));
+    AlternativeServiceInfo alternative_service_info;
+    if (protocol == kProtoQUIC) {
+      alternative_service_info =
+          AlternativeServiceInfo::CreateQuicAlternativeServiceInfo(
+              alternative_service, expiration, advertised_versions);
+    } else {
+      alternative_service_info =
+          AlternativeServiceInfo::CreateHttp2AlternativeServiceInfo(
+              alternative_service, expiration);
+    }
+    alternative_service_info_vector.push_back(alternative_service_info);
   }
+
   http_server_properties_->SetAlternativeServices(
       scheme_host_port, alternative_service_info_vector);
 }
 
 bool SpdySession::OnUnknownFrame(SpdyStreamId stream_id, uint8_t frame_type) {
   // Validate stream id.
   // Was the frame sent on a stream id that has not been used in this session?
   if (stream_id % 2 == 1 && stream_id > stream_hi_water_mark_)
     return false;
 
@@ skipping 194 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net