Landing Recent QUIC changes until 01/28/2016 18:41 UTC

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 <stddef.h>
 
 #include <map>
 #include <string>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_crypto_stream.h"
@@ skipping 194 matching lines @@
   // Mark a stream as draining.
   virtual void StreamDraining(QuicStreamId id);
 
   // Close the connection, if it is not already closed.
   void CloseConnectionWithDetails(QuicErrorCode error, const char* details);
 
   // Returns true if this stream should yield writes to another blocked stream.
   bool ShouldYield(QuicStreamId stream_id);
 
  protected:
-  typedef base::hash_map<QuicStreamId, ReliableQuicStream*> StreamMap;
+  typedef std::unordered_map<QuicStreamId, ReliableQuicStream*> StreamMap;
 
   // Creates a new stream, owned by the caller, to handle a peer-initiated
   // stream.  Returns nullptr and does error handling if the stream can not be
   // created.
   virtual ReliableQuicStream* CreateIncomingDynamicStream(QuicStreamId id) = 0;
 
   // Create a new stream, owned by the caller, to handle a locally-initiated
   // stream.  Returns nullptr if max streams have already been opened.
   virtual ReliableQuicStream* CreateOutgoingDynamicStream(
       SpdyPriority priority) = 0;
@@ skipping 127 matching lines @@
   StreamMap static_stream_map_;
 
   // Map from StreamId to pointers to streams. Owns the streams.
   StreamMap dynamic_stream_map_;
 
   // The ID to use for the next outgoing stream.
   QuicStreamId next_outgoing_stream_id_;
 
   // Set of stream ids that are less than the largest stream id that has been
   // received, but are nonetheless available to be created.
-  base::hash_set<QuicStreamId> available_streams_;
+  std::unordered_set<QuicStreamId> available_streams_;
 
   // Set of stream ids that are "draining" -- a FIN has been sent and received,
   // but the stream object still exists because not all the received data has
   // been consumed.
-  base::hash_set<QuicStreamId> draining_streams_;
+  std::unordered_set<QuicStreamId> draining_streams_;
 
   // A list of streams which need to write more data.
   QuicWriteBlockedList write_blocked_streams_;
 
   QuicStreamId largest_peer_created_stream_id_;
 
   // A counter for peer initiated streams which are in the dynamic_stream_map_.
   size_t num_dynamic_incoming_streams_;
 
   // A counter for peer initiated streams which are in the draining_streams_.
@@ skipping 12 matching lines @@
   // The stream id which was last popped in OnCanWrite, or 0, if not under the
   // call stack of OnCanWrite.
   QuicStreamId currently_writing_stream_id_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SESSION_H_