Index: net/spdy/spdy_network_transaction_unittest.cc |
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc |
index ba42d831330c1935550eb0bcfa470bde93ae6e5e..622532df0943567475d042890f691245edc39eca 100644 |
--- a/net/spdy/spdy_network_transaction_unittest.cc |
+++ b/net/spdy/spdy_network_transaction_unittest.cc |
@@ -746,44 +746,24 @@ TEST_P(SpdyNetworkTransactionTest, GetAtEachPriority) { |
// this repeats the RequestPriority-->SpdyPriority mapping from |
// SpdyFramer::ConvertRequestPriorityToSpdyPriority to make |
// sure it's being done right. |
- if (spdy_util_.spdy_version() < SPDY3) { |
- switch (p) { |
- case HIGHEST: |
- EXPECT_EQ(0, spdy_prio); |
- break; |
- case MEDIUM: |
- EXPECT_EQ(1, spdy_prio); |
- break; |
- case LOW: |
- case LOWEST: |
- EXPECT_EQ(2, spdy_prio); |
- break; |
- case IDLE: |
- EXPECT_EQ(3, spdy_prio); |
- break; |
- default: |
- FAIL(); |
- } |
- } else { |
- switch (p) { |
- case HIGHEST: |
- EXPECT_EQ(0, spdy_prio); |
- break; |
- case MEDIUM: |
- EXPECT_EQ(1, spdy_prio); |
- break; |
- case LOW: |
- EXPECT_EQ(2, spdy_prio); |
- break; |
- case LOWEST: |
- EXPECT_EQ(3, spdy_prio); |
- break; |
- case IDLE: |
- EXPECT_EQ(4, spdy_prio); |
- break; |
- default: |
- FAIL(); |
- } |
+ switch (p) { |
+ case HIGHEST: |
+ EXPECT_EQ(0, spdy_prio); |
+ break; |
+ case MEDIUM: |
+ EXPECT_EQ(1, spdy_prio); |
+ break; |
+ case LOW: |
+ EXPECT_EQ(2, spdy_prio); |
+ break; |
+ case LOWEST: |
+ EXPECT_EQ(3, spdy_prio); |
+ break; |
+ case IDLE: |
+ EXPECT_EQ(4, spdy_prio); |
+ break; |
+ default: |
+ FAIL(); |
} |
scoped_ptr<SpdyFrame> resp(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1)); |
@@ -6349,9 +6329,6 @@ TEST_P(SpdyNetworkTransactionTest, FlowControlNegativeSendWindowSize) { |
} |
TEST_P(SpdyNetworkTransactionTest, GoAwayOnOddPushStreamId) { |
- if (spdy_util_.spdy_version() < SPDY3) |
- return; |
- |
scoped_ptr<SpdyHeaderBlock> push_headers(new SpdyHeaderBlock); |
spdy_util_.AddUrlToHeaderBlock("http://www.example.org/a.dat", |
push_headers.get()); |
@@ -6377,9 +6354,6 @@ TEST_P(SpdyNetworkTransactionTest, GoAwayOnOddPushStreamId) { |
TEST_P(SpdyNetworkTransactionTest, |
GoAwayOnPushStreamIdLesserOrEqualThanLastAccepted) { |
- if (spdy_util_.spdy_version() < SPDY3) |
- return; |
- |
scoped_ptr<SpdyFrame> push_a(spdy_util_.ConstructSpdyPush( |
NULL, 0, 4, 1, GetDefaultUrlWithPath("/a.dat").c_str())); |
scoped_ptr<SpdyHeaderBlock> push_b_headers(new SpdyHeaderBlock); |