Update from chromium https://crrev.com/301725/

net/quic/quic_stream_factory.h

Index: net/quic/quic_stream_factory.h
diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h
index 7ee3681230b62c3b4c707b259f9ed195b854b242..c892cb2b1d9175e51f940b322bfa729f92d6c38c 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -104,6 +104,7 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
       bool enable_port_selection,
       bool always_require_handshake_confirmation,
       bool disable_connection_pooling,
+      int load_server_info_timeout,
       const QuicTagVector& connection_options);
   ~QuicStreamFactory() override;
 
@@ -282,6 +283,11 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
   // Set if we do not want connection pooling.
   bool disable_connection_pooling_;
 
+  // Specifies the timeout in milliseconds to wait for loading of QUIC server
+  // information. If we don't want to timeout, set
+  // |load_server_info_timeout_ms_| to 0.
+  int load_server_info_timeout_ms_;
+
   // Each profile will (probably) have a unique port_seed_ value.  This value is
   // used to help seed a pseudo-random number generator (PortSuggester) so that
   // we consistently (within this profile) suggest the same ephemeral port when
@@ -294,6 +300,8 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
   IPEndPoint local_address_;
   bool check_persisted_supports_quic_;
 
+  base::TaskRunner* task_runner_;
+
   base::WeakPtrFactory<QuicStreamFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory);