| Index: net/quic/quic_headers_stream_test.cc
|
| diff --git a/net/quic/quic_headers_stream_test.cc b/net/quic/quic_headers_stream_test.cc
|
| index edc713db5f87a104e9fbc6a6bf872d78d1550863..939b12e65142b0e990f024a02ff95555783cd64b 100644
|
| --- a/net/quic/quic_headers_stream_test.cc
|
| +++ b/net/quic/quic_headers_stream_test.cc
|
| @@ -157,7 +157,7 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<TestParams> {
|
|
|
| void WriteHeadersAndExpectSynStream(QuicStreamId stream_id,
|
| bool fin,
|
| - QuicPriority priority) {
|
| + SpdyPriority priority) {
|
| WriteHeadersAndCheckData(stream_id, fin, priority, SYN_STREAM);
|
| }
|
|
|
| @@ -168,7 +168,7 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<TestParams> {
|
|
|
| void WriteHeadersAndCheckData(QuicStreamId stream_id,
|
| bool fin,
|
| - QuicPriority priority,
|
| + SpdyPriority priority,
|
| SpdyFrameType type) {
|
| // Write the headers and capture the outgoing data
|
| EXPECT_CALL(session_, WritevData(kHeadersStreamId, _, _, false, _, nullptr))
|
| @@ -259,7 +259,7 @@ TEST_P(QuicHeadersStreamTest, WriteHeaders) {
|
| if (perspective() == Perspective::IS_SERVER) {
|
| WriteHeadersAndExpectSynReply(stream_id, fin);
|
| } else {
|
| - for (QuicPriority priority = 0; priority < 7; ++priority) {
|
| + for (SpdyPriority priority = 0; priority < 7; ++priority) {
|
| // TODO(rch): implement priorities correctly.
|
| WriteHeadersAndExpectSynStream(stream_id, fin, 0);
|
| }
|
| @@ -271,8 +271,8 @@ TEST_P(QuicHeadersStreamTest, WriteHeaders) {
|
| TEST_P(QuicHeadersStreamTest, ProcessRawData) {
|
| for (QuicStreamId stream_id = kClientDataStreamId1;
|
| stream_id < kClientDataStreamId3; stream_id += 2) {
|
| - for (bool fin : kFins) {
|
| - for (QuicPriority priority = 0; priority < 7; ++priority) {
|
| + for (bool fin : {false, true}) {
|
| + for (SpdyPriority priority = 0; priority < 7; ++priority) {
|
| // Replace with "WriteHeadersAndSaveData"
|
| scoped_ptr<SpdySerializedFrame> frame;
|
| if (perspective() == Perspective::IS_SERVER) {
|
| @@ -389,8 +389,8 @@ TEST_P(QuicHeadersStreamTest, ProcessLargeRawData) {
|
| headers_["key2"] = string(1 << 13, '.');
|
| for (QuicStreamId stream_id = kClientDataStreamId1;
|
| stream_id < kClientDataStreamId3; stream_id += 2) {
|
| - for (bool fin : kFins) {
|
| - for (QuicPriority priority = 0; priority < 7; ++priority) {
|
| + for (bool fin : {false, true}) {
|
| + for (SpdyPriority priority = 0; priority < 7; ++priority) {
|
| // Replace with "WriteHeadersAndSaveData"
|
| scoped_ptr<SpdySerializedFrame> frame;
|
| if (perspective() == Perspective::IS_SERVER) {
|
|
|