Changing from QuicPriority to SpdyPriority.

net/quic/quic_write_blocked_list.h

 // Copyright 2014 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.
 //
 #ifndef NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_
 #define NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_
 
 #include <set>
 
 #include "net/base/net_export.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_protocol.h"
 #include "net/spdy/write_blocked_list.h"
 
 namespace net {
 
 // Keeps tracks of the QUIC streams that have data to write, sorted by
 // priority.  QUIC stream priority order is:
 // Crypto stream > Headers stream > Data streams by requested priority.
 class NET_EXPORT_PRIVATE QuicWriteBlockedList {
  private:
   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();
 
   bool HasWriteBlockedDataStreams() const {
     return base_write_blocked_list_.HasWriteBlockedStreams();
   }
 
   bool HasWriteBlockedCryptoOrHeadersStream() const {
     return crypto_stream_blocked_ || headers_stream_blocked_;
   }
@@ skipping 56 matching lines @@
                batch_write_stream_id_[last_priority_popped_] == 0 ||
                bytes == 0);
       }
     }
   }
 
   // Pushes a stream to the back of the std::list for this priority level *unless* it
   // 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;
     }
     if (FLAGS_quic_batch_writes &&
         stream_id == batch_write_stream_id_[last_priority_popped_] &&
         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;
   }
 
   bool crypto_stream_blocked() const { return crypto_stream_blocked_; }
   bool headers_stream_blocked() const { return headers_stream_blocked_; }
 
  private:
   QuicWriteBlockedListBase base_write_blocked_list_;
 
   // If performing batch writes, this will be the stream ID of the stream doing
   // batch writes for this priority level.  We will allow this stream to write
   // until it has written kBatchWriteSize bytes, it has no more data to write,
   // or a higher priority stream preempts.
   QuicStreamId batch_write_stream_id_[kLowestPriority + 1];
   // Set to kBatchWriteSize when we set a new batch_write_stream_id_ for a given
   // priority.  This is decremented with each write the stream does until it is
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicWriteBlockedList);
 };
 
 }  // namespace net
 
 
 #endif  // NET_QUIC_QUIC_WRITE_BLOCKED_LIST_H_