Landing Recent QUIC changes until 5:55 PM, Aug 25, 2016 UTC-4

net/quic/chromium/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/chromium/quic_stream_factory.h"
 
 #include <openssl/aead.h>
 
 #include <algorithm>
 #include <tuple>
@@ skipping 1950 matching lines @@
   if (base::ContainsKey(quic_supported_servers_at_startup_,
                         server_id.host_port_pair())) {
     UMA_HISTOGRAM_BOOLEAN("Net.QuicServerInfo.ExpectConfigMissingFromDiskCache",
                           server_info->state().server_config.empty());
   }
 
   cached->Initialize(server_info->state().server_config,
                      server_info->state().source_address_token,
                      server_info->state().certs, server_info->state().cert_sct,
                      server_info->state().chlo_hash,
-                     server_info->state().server_config_sig, clock_->WallNow());
+                     server_info->state().server_config_sig, clock_->WallNow(),
+                     QuicWallTime::Zero());
 }
 
 void QuicStreamFactory::MaybeInitialize() {
   // We don't initialize data from HttpServerProperties in the constructor
   // because HttpServerProperties has not yet initialized. We're guaranteed
   // HttpServerProperties has been initialized by the first time a request is
   // made.
   if (has_initialized_data_)
     return;
 
@@ skipping 70 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