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 96 matching lines @@
   // Returns mutable config for this session. Returned config is owned
   // by QuicSession.
   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(); }
+  const QuicConnection* connection() const { return connection_.get(); }
   size_t num_active_requests() const { return stream_map_.size(); }
   const IPEndPoint& peer_address() const {
     return connection_->peer_address();
   }
   QuicGuid guid() const { return connection_->guid(); }
 
   QuicPacketCreator::Options* options() { return connection()->options(); }
 
   // Returns the number of currently open streams, including those which have
   // been implicitly created.
@@ skipping 10 matching lines @@
     return goaway_received_;
   }
 
   bool goaway_sent() const {
     return goaway_sent_;
   }
 
   QuicSpdyDecompressor* decompressor() { return &decompressor_; }
   QuicSpdyCompressor* compressor() { return &compressor_; }
 
+  QuicErrorCode error() const { return error_; }
+
  protected:
   // Creates a new stream, owned by the caller, to handle a peer-initiated
   // stream.  Returns NULL and does error handling if the stream can not be
   // created.
   virtual ReliableQuicStream* CreateIncomingReliableStream(QuicStreamId id) = 0;
 
   // Create a new stream, owned by the caller, to handle a locally-initiated
   // stream.  Returns NULL if max streams have already been opened.
   virtual ReliableQuicStream* CreateOutgoingReliableStream() = 0;
 
@@ skipping 10 matching lines @@
 
   // This is called after every call other than OnConnectionClose from the
   // QuicConnectionVisitor to allow post-processing once the work has been done.
   // In this case, it deletes streams given that it's safe to do so (no other
   // operations are being done on the streams at this time)
   virtual void PostProcessAfterData();
 
   base::hash_map<QuicStreamId, ReliableQuicStream*>* streams() {
     return &stream_map_;
   }
+
+  const base::hash_map<QuicStreamId, ReliableQuicStream*>* streams() const {
+    return &stream_map_;
+  }
+
   std::vector<ReliableQuicStream*>* closed_streams() {
     return &closed_streams_;
   }
 
   size_t get_max_open_streams() const {
     return max_open_streams_;
   }
 
   void set_max_open_streams(size_t max_open_streams) {
     max_open_streams_ = max_open_streams;
@@ skipping 34 matching lines @@
 
   // A list of streams which need to write more data.
   BlockedList<QuicStreamId> write_blocked_streams_;
 
   // A map of headers waiting to be compressed, and the streams
   // they are associated with.
   map<uint32, QuicStreamId> decompression_blocked_streams_;
 
   QuicStreamId largest_peer_created_stream_id_;
 
+  // The latched error with which the connection was closed.
+  QuicErrorCode error_;
+
   // Whether a GoAway has been received.
   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_