| Index: net/quic/quic_write_blocked_list.h
|
| diff --git a/net/quic/quic_write_blocked_list.h b/net/quic/quic_write_blocked_list.h
|
| index 63580f857bf089a92079c37082d1c2a98906a85c..2e6ee0d80ea53f41a3f946e76173addf33b61413 100644
|
| --- a/net/quic/quic_write_blocked_list.h
|
| +++ b/net/quic/quic_write_blocked_list.h
|
| @@ -22,11 +22,6 @@ class NET_EXPORT_PRIVATE QuicWriteBlockedList {
|
| typedef WriteBlockedList<QuicStreamId> QuicWriteBlockedListBase;
|
|
|
| public:
|
| - static const QuicPriority kHighestPriority =
|
| - static_cast<QuicPriority>(net::kHighestPriority);
|
| - static const QuicPriority kLowestPriority =
|
| - static_cast<QuicPriority>(net::kLowestPriority);
|
| -
|
| QuicWriteBlockedList();
|
| ~QuicWriteBlockedList();
|
|
|
| @@ -103,16 +98,16 @@ class NET_EXPORT_PRIVATE QuicWriteBlockedList {
|
| // is latched for doing batched writes in which case it goes to the front of
|
| // the std::list for this priority level.
|
| // Headers and crypto streams are special cased to always resume first.
|
| - void AddStream(QuicStreamId stream_id, QuicPriority priority) {
|
| + void AddStream(QuicStreamId stream_id, SpdyPriority priority) {
|
| if (stream_id == kCryptoStreamId) {
|
| - DCHECK_EQ(kHighestPriority, priority);
|
| + DCHECK_EQ(net::kHighestPriority, priority);
|
| // TODO(avd) Add DCHECK(!crypto_stream_blocked_)
|
| crypto_stream_blocked_ = true;
|
| return;
|
| }
|
|
|
| if (stream_id == kHeadersStreamId) {
|
| - DCHECK_EQ(kHighestPriority, priority);
|
| + DCHECK_EQ(net::kHighestPriority, priority);
|
| // TODO(avd) Add DCHECK(!headers_stream_blocked_);
|
| headers_stream_blocked_ = true;
|
| return;
|
| @@ -122,11 +117,9 @@ class NET_EXPORT_PRIVATE QuicWriteBlockedList {
|
| bytes_left_for_batch_write_[last_priority_popped_] > 0) {
|
| // If the batch write stream has more data to write, push it to the front
|
| // for its priority level.
|
| - base_write_blocked_list_.PushFront(
|
| - stream_id, static_cast<SpdyPriority>(priority));
|
| + base_write_blocked_list_.PushFront(stream_id, priority);
|
| } else {
|
| - base_write_blocked_list_.PushBack(
|
| - stream_id, static_cast<SpdyPriority>(priority));
|
| + base_write_blocked_list_.PushBack(stream_id, priority);
|
| }
|
| return;
|
| }
|
| @@ -147,7 +140,7 @@ class NET_EXPORT_PRIVATE QuicWriteBlockedList {
|
| // done with its batch write.
|
| int32 bytes_left_for_batch_write_[kLowestPriority + 1];
|
| // Tracks the last priority popped for UpdateBytesForStream.
|
| - QuicPriority last_priority_popped_;
|
| + SpdyPriority last_priority_popped_;
|
|
|
| bool crypto_stream_blocked_;
|
| bool headers_stream_blocked_;
|
|
|