Remove SPDY priority #defines from spdy_protocol.h since they differ between SPDY 2 and SPDY 3.

net/spdy/spdy_http_utils.cc

 // 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 <string>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 112 matching lines @@
     headers->erase("host"); // this is kinda insane, spdy 3 spec.
   }
 
 }
 
 SpdyPriority ConvertRequestPriorityToSpdyPriority(
     const RequestPriority priority,
     int protocol_version) {
   DCHECK(HIGHEST <= priority && priority < NUM_PRIORITIES);
   if (protocol_version == 2) {
-    switch (priority) {
-      case LOWEST:
-        return SPDY_PRIORITY_LOWEST - 1;
-      case IDLE:
-        return SPDY_PRIORITY_LOWEST;
-      default:
-        return priority;
+    // SPDY 2 only has 2 bits of priority, but we have 5 RequestPriorities.
+    if (priority < LOWEST) {
+      return priority;
+    } else {
+      DCHECK_GE(4, priority);
+      return priority - 1;
     }
   } else {
+    DCHECK_GE(7, priority);
     return priority;
   }
 }
 
 GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
                            int protocol_version,
                            bool pushed) {
   // SPDY 2 server push urls are specified in a single "url" header.
   if (pushed && protocol_version == 2) {
       std::string url;
@@ skipping 21 matching lines @@
   it = headers.find(path_header);
   if (it != headers.end())
     path = it->second;
 
   std::string url =  (scheme.empty() || host_port.empty() || path.empty())
       ? "" : scheme + "://" + host_port + path;
   return GURL(url);
 }
 
 }  // namespace net