Land Recent QUIC changes.

net/quic/quic_stream_factory.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_STREAM_FACTORY_H_
 #define NET_QUIC_QUIC_STREAM_FACTORY_H_
 
 #include <map>
 #include <string>
 
@@ skipping 136 matching lines @@
   // (not going away session, once they're implemented).
   SessionMap active_sessions_;
   SessionAliasMap session_aliases_;
 
   // Contains owning pointers to QuicCryptoClientConfig. QuicCryptoClientConfig
   // contains configuration and cached state about servers.
   // TODO(rtenneti): Persist all_crypto_configs_ to disk and decide when to
   // clear the data in the map.
   CryptoConfigMap all_crypto_configs_;
 
+  QuicConfig config_;
+
   JobMap active_jobs_;
   JobRequestsMap job_requests_map_;
   RequestMap active_requests_;
 
   base::WeakPtrFactory<QuicStreamFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_STREAM_FACTORY_H_