Land Recent QUIC changes.

net/quic/quic_session.h

Index: net/quic/quic_session.h
diff --git a/net/quic/quic_session.h b/net/quic/quic_session.h
index e5793d78cd078c5f248ed37b24fa728d690d8f5d..5f85dd63e4038eb43ef10720c5fab1d0c911a715 100644
--- a/net/quic/quic_session.h
+++ b/net/quic/quic_session.h
@@ -114,6 +114,7 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
   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();
@@ -144,6 +145,8 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
   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
@@ -174,6 +177,11 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
   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_;
   }
@@ -228,6 +236,9 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
 
   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.