Make ConvertRequestPriorityToSpdyPriority aware of new SPDY 3 priorities.

BUG=123278
TEST=net_unittests

Review URL: http://codereview.chromium.org/10105034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132642 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 88 insertions, 50 deletions

diff --git a/net/net.gyp b/net/net.gyp
index c1301a3..a904940 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1206,6 +1206,7 @@
         'spdy/spdy_framer_test.cc',
         'spdy/spdy_http_stream_spdy3_unittest.cc',
         'spdy/spdy_http_stream_spdy2_unittest.cc',
+        'spdy/spdy_http_utils_unittest.cc',
         'spdy/spdy_network_transaction_spdy3_unittest.cc',
         'spdy/spdy_network_transaction_spdy2_unittest.cc',
         'spdy/spdy_protocol_test.cc',
diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc
index 5cd0413..460215e 100644
--- a/net/spdy/spdy_http_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc
@@ -289,7 +289,7 @@ SpdyFrame* ConstructCredentialRequestFrame(int slot, const GURL& url,
     SYN_STREAM,
     stream_id,
     0,
-    ConvertRequestPriorityToSpdyPriority(LOWEST),
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),
     slot,
     CONTROL_FLAG_FIN,
     false,
diff --git a/net/spdy/spdy_http_utils.cc b/net/spdy/spdy_http_utils.cc
index 232caeb..0a0df47 100644
--- a/net/spdy/spdy_http_utils.cc
+++ b/net/spdy/spdy_http_utils.cc
@@ -125,17 +125,21 @@ void CreateSpdyHeadersFromHttpRequest(const HttpRequestInfo& info,
 
 }
 
-// TODO(gavinp): re-adjust this once SPDY v3 has three priority bits,
-// eliminating the need for this folding.
-int ConvertRequestPriorityToSpdyPriority(const RequestPriority priority) {
+SpdyPriority ConvertRequestPriorityToSpdyPriority(
+    const RequestPriority priority,
+    int protocol_version) {
   DCHECK(HIGHEST <= priority && priority < NUM_PRIORITIES);
-  switch (priority) {
-    case LOWEST:
-      return SPDY_PRIORITY_LOWEST - 1;
-    case IDLE:
-      return SPDY_PRIORITY_LOWEST;
-    default:
-      return priority;
+  if (protocol_version == 2) {
+    switch (priority) {
+      case LOWEST:
+        return SPDY_PRIORITY_LOWEST - 1;
+      case IDLE:
+        return SPDY_PRIORITY_LOWEST;
+      default:
+        return priority;
+    }
+  } else {
+    return priority;
   }
 }
 
diff --git a/net/spdy/spdy_http_utils.h b/net/spdy/spdy_http_utils.h
index 91f6ddc..3dc8263 100644
--- a/net/spdy/spdy_http_utils.h
+++ b/net/spdy/spdy_http_utils.h
@@ -40,8 +40,9 @@ GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
                            int protocol_version,
                            bool pushed);
 
-NET_EXPORT_PRIVATE int ConvertRequestPriorityToSpdyPriority(
-    RequestPriority priority);
+NET_EXPORT_PRIVATE SpdyPriority ConvertRequestPriorityToSpdyPriority(
+    RequestPriority priority,
+    int protocol_version);
 
 }  // namespace net
 
diff --git a/net/spdy/spdy_http_utils_unittest.cc b/net/spdy/spdy_http_utils_unittest.cc
new file mode 100644
index 0000000..2419de1
--- /dev/null
+++ b/net/spdy/spdy_http_utils_unittest.cc
@@ -0,0 +1,30 @@
+// Copyright (c) 2012 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.
+
+#include "net/spdy/spdy_http_utils.h"
+
+#include "testing/platform_test.h"
+
+namespace net {
+
+namespace test {
+
+TEST(SpdyHttpUtilsTest, ConvertRequestPriorityToSpdy2Priority) {
+  EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST, 2));
+  EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM, 2));
+  EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW, 2));
+  EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOWEST, 2));
+  EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(IDLE, 2));
+}
+TEST(SpdyHttpUtilsTest, ConvertRequestPriorityToSpdy3Priority) {
+  EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST, 3));
+  EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM, 3));
+  EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW, 3));
+  EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(LOWEST, 3));
+  EXPECT_EQ(4, ConvertRequestPriorityToSpdyPriority(IDLE, 3));
+}
+
+}  // namespace test
+
+}  // namespace net
diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index 85b875e..df30784 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -1439,7 +1439,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Put) {
     SYN_STREAM,             // Kind = Syn
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_FIN,       // Control Flags
     false,                  // Compressed
     INVALID,                // Status
@@ -1466,7 +1466,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Put) {
     SYN_REPLY,              // Kind = SynReply
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
     INVALID,                // Status
@@ -1510,7 +1510,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Head) {
     SYN_STREAM,             // Kind = Syn
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_FIN,       // Control Flags
     false,                  // Compressed
     INVALID,                // Status
@@ -1537,7 +1537,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Head) {
     SYN_REPLY,              // Kind = SynReply
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
     INVALID,                // Status
@@ -3178,7 +3178,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, SynReplyHeadersVary) {
     SYN_REPLY,                              // Syn Reply
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
     INVALID,                                // Status
@@ -3346,7 +3346,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, InvalidSynReply) {
     SYN_REPLY,              // Kind = SynReply
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
     INVALID,                // Status
@@ -4066,7 +4066,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, SettingsSaved) {
     SYN_REPLY,                              // Syn Reply
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
     INVALID,                                // Status
@@ -4172,7 +4172,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, SettingsPlayback) {
     SYN_REPLY,                              // Syn Reply
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
     INVALID,                                // Status
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index 666cf54..3826ac1 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -588,12 +588,14 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, GetAtEachPriority) {
         EXPECT_EQ(1, spdy_prio);
         break;
       case LOW:
-      case LOWEST:
         EXPECT_EQ(2, spdy_prio);
         break;
-      case IDLE:
+      case LOWEST:
         EXPECT_EQ(3, spdy_prio);
         break;
+      case IDLE:
+        EXPECT_EQ(4, spdy_prio);
+        break;
       default:
         FAIL();
     }
@@ -1441,7 +1443,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, Put) {
     SYN_STREAM,             // Kind = Syn
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                      // Credential Slot
     CONTROL_FLAG_FIN,       // Control Flags
     false,                  // Compressed
@@ -1469,7 +1471,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, Put) {
     SYN_REPLY,              // Kind = SynReply
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                      // Credential Slot
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
@@ -1514,7 +1516,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, Head) {
     SYN_STREAM,             // Kind = Syn
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                      // Credential Slot
     CONTROL_FLAG_FIN,       // Control Flags
     false,                  // Compressed
@@ -1542,7 +1544,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, Head) {
     SYN_REPLY,              // Kind = SynReply
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                      // Credential Slot
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
@@ -3746,7 +3748,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, SynReplyHeadersVary) {
     SYN_REPLY,                              // Syn Reply
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                                      // Credential Slot
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
@@ -3915,7 +3917,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, InvalidSynReply) {
     SYN_REPLY,              // Kind = SynReply
     1,                      // Stream ID
     0,                      // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                      // Credential Slot
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
@@ -4636,7 +4638,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, SettingsSaved) {
     SYN_REPLY,                              // Syn Reply
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                                      // Credential Slot
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
@@ -4743,7 +4745,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, SettingsPlayback) {
     SYN_REPLY,                              // Syn Reply
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                                      // Credential Slot
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
index 4f32675..e0deb42 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
@@ -318,7 +318,7 @@ SpdyProxyClientSocketSpdy2Test::ConstructConnectRequestFrame() {
     SYN_STREAM,
     kStreamId,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    net::ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
     CONTROL_FLAG_NONE,
     false,
     INVALID,
@@ -345,7 +345,7 @@ SpdyProxyClientSocketSpdy2Test::ConstructConnectAuthRequestFrame() {
     SYN_STREAM,
     kStreamId,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    net::ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
     CONTROL_FLAG_NONE,
     false,
     INVALID,
diff --git a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
index 58665f7..7ae2140 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
@@ -318,7 +318,7 @@ SpdyProxyClientSocketSpdy3Test::ConstructConnectRequestFrame() {
     SYN_STREAM,
     kStreamId,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    net::ConvertRequestPriorityToSpdyPriority(LOWEST, 3),
     0,
     CONTROL_FLAG_NONE,
     false,
@@ -346,7 +346,7 @@ SpdyProxyClientSocketSpdy3Test::ConstructConnectAuthRequestFrame() {
     SYN_STREAM,
     kStreamId,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    net::ConvertRequestPriorityToSpdyPriority(LOWEST, 3),
     0,
     CONTROL_FLAG_NONE,
     false,
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index ee0918b..694d508 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -662,7 +662,7 @@ int SpdySession::WriteSynStream(
   scoped_ptr<SpdySynStreamControlFrame> syn_frame(
       buffered_spdy_framer_->CreateSynStream(
           stream_id, 0,
-          ConvertRequestPriorityToSpdyPriority(priority),
+          ConvertRequestPriorityToSpdyPriority(priority, GetProtocolVersion()),
           credential_slot, flags, false, headers.get()));
   QueueFrame(syn_frame.get(), priority, stream);
 
diff --git a/net/spdy/spdy_stream_spdy2_unittest.cc b/net/spdy/spdy_stream_spdy2_unittest.cc
index 1ca2923..cd03897 100644
--- a/net/spdy/spdy_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_stream_spdy2_unittest.cc
@@ -136,7 +136,7 @@ TEST_F(SpdyStreamSpdy2Test, SendDataAfterOpen) {
     SYN_STREAM,
     1,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
     CONTROL_FLAG_NONE,
     false,
     INVALID,
@@ -307,7 +307,7 @@ TEST_F(SpdyStreamSpdy2Test, StreamError) {
     SYN_STREAM,
     1,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
     CONTROL_FLAG_NONE,
     false,
     INVALID,
diff --git a/net/spdy/spdy_stream_spdy3_unittest.cc b/net/spdy/spdy_stream_spdy3_unittest.cc
index 56af9e0..5d01889 100644
--- a/net/spdy/spdy_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_stream_spdy3_unittest.cc
@@ -136,7 +136,7 @@ TEST_F(SpdyStreamSpdy3Test, SendDataAfterOpen) {
     SYN_STREAM,
     1,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),
     0,
     CONTROL_FLAG_NONE,
     false,
@@ -311,7 +311,7 @@ TEST_F(SpdyStreamSpdy3Test, StreamError) {
     SYN_STREAM,
     1,
     0,
-    net::ConvertRequestPriorityToSpdyPriority(LOWEST),
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),
     0,
     CONTROL_FLAG_NONE,
     false,
diff --git a/net/spdy/spdy_test_util_spdy2.cc b/net/spdy/spdy_test_util_spdy2.cc
index 1e39e62..f67e789 100644
--- a/net/spdy/spdy_test_util_spdy2.cc
+++ b/net/spdy/spdy_test_util_spdy2.cc
@@ -332,7 +332,7 @@ SpdyFrame* ConstructSpdyControlFrame(const char* const extra_headers[],
     type,                         // Kind = Syn
     stream_id,                    // Stream ID
     associated_stream_id,         // Associated stream ID
-    ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 2),
                                   // Priority
     flags,                        // Control Flags
     compressed,                   // Compressed
@@ -361,7 +361,7 @@ SpdyFrame* ConstructSpdyGet(const char* const url,
     SYN_STREAM,             // Kind = Syn
     stream_id,                    // Stream ID
     0,                            // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 2),
                                   // Priority
     CONTROL_FLAG_FIN,       // Control Flags
     compressed,                   // Compressed
@@ -992,7 +992,7 @@ const SpdyHeaderInfo MakeSpdyHeader(SpdyControlType type) {
     type,                         // Kind = Syn
     1,                            // Stream ID
     0,                            // Associated stream ID
-    2,                            // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
     CONTROL_FLAG_FIN,       // Control Flags
     false,                        // Compressed
     INVALID,                // Status
diff --git a/net/spdy/spdy_test_util_spdy3.cc b/net/spdy/spdy_test_util_spdy3.cc
index 258382a..96bfbd9 100644
--- a/net/spdy/spdy_test_util_spdy3.cc
+++ b/net/spdy/spdy_test_util_spdy3.cc
@@ -334,7 +334,7 @@ SpdyFrame* ConstructSpdyControlFrame(const char* const extra_headers[],
     type,                         // Kind = Syn
     stream_id,                    // Stream ID
     associated_stream_id,         // Associated stream ID
-    ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 3),
                                   // Priority
     0,                            // Credential Slot
     flags,                        // Control Flags
@@ -364,7 +364,7 @@ SpdyFrame* ConstructSpdyGet(const char* const url,
     SYN_STREAM,             // Kind = Syn
     stream_id,                    // Stream ID
     0,                            // Associated stream ID
-    net::ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 3),
                                   // Priority
     0,                            // Credential Slot
     CONTROL_FLAG_FIN,       // Control Flags
@@ -975,7 +975,7 @@ const SpdyHeaderInfo MakeSpdyHeader(SpdyControlType type) {
     type,                         // Kind = Syn
     1,                            // Stream ID
     0,                            // Associated stream ID
-    2,                            // Priority
+    ConvertRequestPriorityToSpdyPriority(LOWEST, 3),  // Priority
     0,                            // Credential Slot
     CONTROL_FLAG_FIN,       // Control Flags
     false,                        // Compressed
diff --git a/net/spdy/spdy_websocket_test_util_spdy2.cc b/net/spdy/spdy_websocket_test_util_spdy2.cc
index a72398e..c2c042f 100644
--- a/net/spdy/spdy_websocket_test_util_spdy2.cc
+++ b/net/spdy/spdy_websocket_test_util_spdy2.cc
@@ -30,7 +30,7 @@ SpdyFrame* ConstructSpdyWebSocketHandshakeRequestFrame(
     SYN_STREAM,
     stream_id,
     kDefaultAssociatedStreamId,
-    ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 2),
     CONTROL_FLAG_NONE,
     kDefaultCompressed,
     INVALID,
@@ -59,7 +59,7 @@ SpdyFrame* ConstructSpdyWebSocketHandshakeResponseFrame(
     SYN_REPLY,
     stream_id,
     kDefaultAssociatedStreamId,
-    ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 2),
     CONTROL_FLAG_NONE,
     kDefaultCompressed,
     INVALID,
diff --git a/net/spdy/spdy_websocket_test_util_spdy3.cc b/net/spdy/spdy_websocket_test_util_spdy3.cc
index 43057d4..f6b430a 100644
--- a/net/spdy/spdy_websocket_test_util_spdy3.cc
+++ b/net/spdy/spdy_websocket_test_util_spdy3.cc
@@ -31,7 +31,7 @@ SpdyFrame* ConstructSpdyWebSocketHandshakeRequestFrame(
     SYN_STREAM,
     stream_id,
     kDefaultAssociatedStreamId,
-    ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 3),
     kDefaultCredentialSlot,
     CONTROL_FLAG_NONE,
     kDefaultCompressed,
@@ -61,7 +61,7 @@ SpdyFrame* ConstructSpdyWebSocketHandshakeResponseFrame(
     SYN_REPLY,
     stream_id,
     kDefaultAssociatedStreamId,
-    ConvertRequestPriorityToSpdyPriority(request_priority),
+    ConvertRequestPriorityToSpdyPriority(request_priority, 3),
     kDefaultCredentialSlot,
     CONTROL_FLAG_NONE,
     kDefaultCompressed,