Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: net/quic/core/quic_session.cc

Issue 2229393003: net: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/core/quic_sent_packet_manager_test.cc ('k') | net/quic/core/quic_session_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_session.cc
diff --git a/net/quic/core/quic_session.cc b/net/quic/core/quic_session.cc
index c3bf20ba2b1d5eb47f9553466b3bb0449f66cf91..33ae358132d7651c2ec60af99da0b8bb8c1dac11 100644
--- a/net/quic/core/quic_session.cc
+++ b/net/quic/core/quic_session.cc
@@ -57,8 +57,8 @@ void QuicSession::Initialize() {
}
QuicSession::~QuicSession() {
- STLDeleteElements(&closed_streams_);
- STLDeleteValues(&dynamic_stream_map_);
+ base::STLDeleteElements(&closed_streams_);
+ base::STLDeleteValues(&dynamic_stream_map_);
DLOG_IF(WARNING, num_locally_closed_incoming_streams_highest_offset() >
max_open_incoming_streams_)
@@ -90,7 +90,7 @@ void QuicSession::OnStreamFrame(const QuicStreamFrame& frame) {
}
void QuicSession::OnRstStream(const QuicRstStreamFrame& frame) {
- if (ContainsKey(static_stream_map_, frame.stream_id)) {
+ if (base::ContainsKey(static_stream_map_, frame.stream_id)) {
connection()->CloseConnection(
QUIC_INVALID_STREAM_ID, "Attempt to reset a static stream",
ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
@@ -270,7 +270,7 @@ QuicConsumedData QuicSession::WritevData(
void QuicSession::SendRstStream(QuicStreamId id,
QuicRstStreamErrorCode error,
QuicStreamOffset bytes_written) {
- if (ContainsKey(static_stream_map_, id)) {
+ if (base::ContainsKey(static_stream_map_, id)) {
QUIC_BUG << "Cannot send RST for a static stream with ID " << id;
return;
}
@@ -535,8 +535,8 @@ QuicConfig* QuicSession::config() {
void QuicSession::ActivateStream(ReliableQuicStream* stream) {
DVLOG(1) << ENDPOINT << "num_streams: " << dynamic_stream_map_.size()
<< ". activating " << stream->id();
- DCHECK(!ContainsKey(dynamic_stream_map_, stream->id()));
- DCHECK(!ContainsKey(static_stream_map_, stream->id()));
+ DCHECK(!base::ContainsKey(dynamic_stream_map_, stream->id()));
+ DCHECK(!base::ContainsKey(static_stream_map_, stream->id()));
dynamic_stream_map_[stream->id()] = stream;
if (IsIncomingStream(stream->id())) {
++num_dynamic_incoming_streams_;
@@ -561,8 +561,8 @@ ReliableQuicStream* QuicSession::GetOrCreateStream(
}
void QuicSession::StreamDraining(QuicStreamId stream_id) {
- DCHECK(ContainsKey(dynamic_stream_map_, stream_id));
- if (!ContainsKey(draining_streams_, stream_id)) {
+ DCHECK(base::ContainsKey(dynamic_stream_map_, stream_id));
+ if (!base::ContainsKey(draining_streams_, stream_id)) {
draining_streams_.insert(stream_id);
if (IsIncomingStream(stream_id)) {
++num_draining_incoming_streams_;
@@ -614,7 +614,7 @@ bool QuicSession::ShouldYield(QuicStreamId stream_id) {
ReliableQuicStream* QuicSession::GetOrCreateDynamicStream(
const QuicStreamId stream_id) {
- DCHECK(!ContainsKey(static_stream_map_, stream_id))
+ DCHECK(!base::ContainsKey(static_stream_map_, stream_id))
<< "Attempt to call GetOrCreateDynamicStream for a static stream";
DynamicStreamMap::iterator it = dynamic_stream_map_.find(stream_id);
@@ -683,13 +683,13 @@ bool QuicSession::IsClosedStream(QuicStreamId id) {
}
// For peer created streams, we also need to consider available streams.
return id <= largest_peer_created_stream_id_ &&
- !ContainsKey(available_streams_, id);
+ !base::ContainsKey(available_streams_, id);
}
bool QuicSession::IsOpenStream(QuicStreamId id) {
DCHECK_NE(0u, id);
- if (ContainsKey(static_stream_map_, id) ||
- ContainsKey(dynamic_stream_map_, id)) {
+ if (base::ContainsKey(static_stream_map_, id) ||
+ base::ContainsKey(dynamic_stream_map_, id)) {
// Stream is active
return true;
}
@@ -728,7 +728,7 @@ bool QuicSession::HasDataToWrite() const {
}
void QuicSession::PostProcessAfterData() {
- STLDeleteElements(&closed_streams_);
+ base::STLDeleteElements(&closed_streams_);
closed_streams_.clear();
}
« no previous file with comments | « net/quic/core/quic_sent_packet_manager_test.cc ('k') | net/quic/core/quic_session_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698