Move VisitorShim from QuicServerSession to QuicSession.

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>
 
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/reliable_quic_stream.h"
 
 namespace net {
 
 class QuicCryptoStream;
 class ReliableQuicStream;
+class VisitorShim;
 
 namespace test {
 class QuicSessionPeer;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface {
  public:
   QuicSession(QuicConnection* connection, bool is_server);
 
   virtual ~QuicSession();
@@ skipping 69 matching lines @@
   QuicStreamId GetNextStreamId();
 
   ReliableQuicStream* GetIncomingReliableStream(QuicStreamId stream_id);
 
   size_t get_max_open_streams() const {
     return max_open_streams_;
   }
 
  private:
   friend class test::QuicSessionPeer;
+  friend class VisitorShim;
 
   typedef base::hash_map<QuicStreamId, ReliableQuicStream*> ReliableStreamMap;
 
   ReliableQuicStream* GetStream(const QuicStreamId stream_id);
 
+  // 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
+  // opterations are being done on the streams at this time)
+  void PostProcessAfterData();
+
   scoped_ptr<QuicConnection> connection_;
 
+  // A shim to stand between the connection and the session, to handle stream
+  // deletions.
+  scoped_ptr<VisitorShim> visitor_shim_;
+
+  std::vector<ReliableQuicStream*> closed_streams_;
+
   // Returns the maximum number of streams this connection can open.
   const size_t max_open_streams_;
 
   // Map from StreamId to pointers to streams that are owned by the caller.
   ReliableStreamMap stream_map_;
   QuicStreamId next_stream_id_;
   bool is_server_;
 
   // Set of stream ids that have been "implicitly created" by receipt
   // of a stream id larger than the next expected stream id.
   base::hash_set<QuicStreamId> implicitly_created_streams_;
 
   // A list of streams which need to write more data.
   std::list<QuicStreamId> write_blocked_streams_;
 
   QuicStreamId largest_peer_created_stream_id_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_