diff --git a/quic/tools/quic_simple_server_session.h b/quic/tools/quic_simple_server_session.h
index a63ae3e..d219b32 100644
--- a/quic/tools/quic_simple_server_session.h
+++ b/quic/tools/quic_simple_server_session.h
@@ -147,7 +147,7 @@
   // the queue also increases by 2 from previous one's. The front element's
   // stream_id is always next_outgoing_stream_id_, and the last one is always
   // highest_promised_stream_id_.
-  QuicDeque<PromisedStreamInfo> promised_streams_;
+  QuicCircularDeque<PromisedStreamInfo> promised_streams_;
 
   QuicSimpleServerBackend* quic_simple_server_backend_;  // Not owned.
 };
diff --git a/quic/tools/quic_transport_simple_server_session.h b/quic/tools/quic_transport_simple_server_session.h
index ccdf28b..7a5fb09 100644
--- a/quic/tools/quic_transport_simple_server_session.h
+++ b/quic/tools/quic_transport_simple_server_session.h
@@ -64,7 +64,7 @@
   const bool owns_connection_;
   Mode mode_;
   std::vector<url::Origin> accepted_origins_;
-  QuicDeque<std::string> streams_to_echo_back_;
+  QuicCircularDeque<std::string> streams_to_echo_back_;
 };
 
 }  // namespace quic