QUIC - Allow cronet apps to specify how many server configs are to be

net/quic/quic_stream_factory.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/quic/quic_stream_factory.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 552 matching lines @@
     bool enable_non_blocking_io,
     bool disable_disk_cache,
     bool prefer_aes,
     int max_number_of_lossy_connections,
     float packet_loss_threshold,
     int max_disabled_reasons,
     int threshold_public_resets_post_handshake,
     int threshold_timeouts_with_open_streams,
     int socket_receive_buffer_size,
     bool delay_tcp_race,
-    bool store_server_configs_in_properties,
+    int number_of_server_configs_stored_in_properties,
     bool close_sessions_on_ip_change,
     int idle_connection_timeout_seconds,
     const QuicTagVector& connection_options)
     : require_confirmation_(true),
       host_resolver_(host_resolver),
       client_socket_factory_(client_socket_factory),
       http_server_properties_(http_server_properties),
       transport_security_state_(transport_security_state),
       cert_transparency_verifier_(cert_transparency_verifier),
       quic_crypto_client_stream_factory_(quic_crypto_client_stream_factory),
@@ skipping 27 matching lines @@
       max_timeouts_with_open_streams_(0),
       threshold_timeouts_with_open_streams_(
           threshold_timeouts_with_open_streams),
       threshold_public_resets_post_handshake_(
           threshold_public_resets_post_handshake),
       socket_receive_buffer_size_(socket_receive_buffer_size),
       delay_tcp_race_(delay_tcp_race),
       yield_after_packets_(kQuicYieldAfterPacketsRead),
       yield_after_duration_(QuicTime::Delta::FromMilliseconds(
           kQuicYieldAfterDurationMilliseconds)),
-      store_server_configs_in_properties_(store_server_configs_in_properties),
+      number_of_server_configs_stored_in_properties_(
+          number_of_server_configs_stored_in_properties),
       close_sessions_on_ip_change_(close_sessions_on_ip_change),
       port_seed_(random_generator_->RandUint64()),
       check_persisted_supports_quic_(true),
       has_initialized_data_(false),
       task_runner_(nullptr),
       weak_factory_(this) {
   DCHECK(transport_security_state_);
   DCHECK(http_server_properties_);
   crypto_config_.set_user_agent_id(user_agent_id);
   crypto_config_.AddCanonicalSuffix(".c.youtube.com");
@@ skipping 14 matching lines @@
 #endif
   UMA_HISTOGRAM_BOOLEAN("Net.QuicSession.PreferAesGcm",
                         has_aes_hardware_support);
   if (has_aes_hardware_support || prefer_aes_)
     crypto_config_.PreferAesGcm();
   if (!IsEcdsaSupported())
     crypto_config_.DisableEcdsa();
   // When disk cache is used to store the server configs, HttpCache code calls
   // |set_quic_server_info_factory| if |quic_server_info_factory_| wasn't
   // created.
-  if (store_server_configs_in_properties_) {
+  if (number_of_server_configs_stored_in_properties_ > 0) {
     quic_server_info_factory_.reset(
         new PropertiesBasedQuicServerInfoFactory(http_server_properties_));
+    http_server_properties_->set_number_of_server_configs_stored_in_properties(
+        number_of_server_configs_stored_in_properties_);

[Ryan Hamilton, 2016/01/12 19:54:56]

I'm a bit surprised to see this code living in QuicStreamFactory. Is there a way
to do this logic directly in HttpServerProperties<something>

[ramant (doing other things), 2016/01/14 00:14:01]

Done.

   }
 
   if (close_sessions_on_ip_change_) {
     NetworkChangeNotifier::AddIPAddressObserver(this);
   }
 }
 
 QuicStreamFactory::~QuicStreamFactory() {
   CloseAllSessions(ERR_ABORTED);
   while (!all_sessions_.empty()) {
@@ skipping 727 matching lines @@
            key_value : http_server_properties_->alternative_service_map()) {
     for (const AlternativeServiceInfo& alternative_service_info :
          key_value.second) {
       if (alternative_service_info.alternative_service.protocol == QUIC) {
         quic_supported_servers_at_startup_.insert(key_value.first);
         break;
       }
     }
   }
 
-  if (!store_server_configs_in_properties_)
+  if (number_of_server_configs_stored_in_properties_ == 0)
     return;
   // Create a temporary QuicServerInfo object to deserialize and to populate the
   // in-memory crypto server config cache.
   scoped_ptr<QuicServerInfo> server_info;
   CompletionCallback callback;
   for (const auto& key_value :
        http_server_properties_->quic_server_info_map()) {
     const QuicServerId& server_id = key_value.first;
     server_info.reset(quic_server_info_factory_->GetForServer(server_id));
     if (server_info->WaitForDataReady(callback) == OK) {
@@ skipping 39 matching lines @@
   // Since the session was active, there's no longer an
   // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP
   // job also fails. So to avoid not using QUIC when we otherwise could, we mark
   // it as recently broken, which means that 0-RTT will be disabled but we'll
   // still race.
   http_server_properties_->MarkAlternativeServiceRecentlyBroken(
       alternative_service);
 }
 
 }  // namespace net