Land Recent QUIC changes.

net/quic/quic_session.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.
 //
 // A QuicSession, which demuxes a single connection to individual streams.
 
 #ifndef NET_QUIC_QUIC_SESSION_H_
 #define NET_QUIC_QUIC_SESSION_H_
 
 #include <vector>
@@ skipping 88 matching lines @@
   // Clients will call this function in the order:
   //   ENCRYPTION_FIRST_ESTABLISHED
   //   zero or more ENCRYPTION_REESTABLISHED
   //   HANDSHAKE_CONFIRMED
   //
   // Servers will simply call it once with HANDSHAKE_CONFIRMED.
   virtual void OnCryptoHandshakeEvent(CryptoHandshakeEvent event);
 
   // Returns mutable config for this session. Returned config is owned
   // by QuicSession.
-  virtual QuicConfig* config();
+  QuicConfig* config();
 
   // Returns true if the stream existed previously and has been closed.
   // Returns false if the stream is still active or if the stream has
   // not yet been created.
   bool IsClosedStream(QuicStreamId id);
 
   QuicConnection* connection() { return connection_.get(); }
   size_t num_active_requests() const { return stream_map_.size(); }
   const IPEndPoint& peer_address() const {
     return connection_->peer_address();
@@ skipping 112 matching lines @@
   bool goaway_received_;
   // Whether a GoAway has been sent.
   bool goaway_sent_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_