DO NOT COMMIT: More hacks to get HTTP/2 working

net/spdy/spdy_http_utils.h

Index: net/spdy/spdy_http_utils.h
diff --git a/net/spdy/spdy_http_utils.h b/net/spdy/spdy_http_utils.h
index 26511a7783494f4e70a74e55b0ab04d96e13e11b..6a91c888c9a0cc649152a60b0c656da648e814f7 100644
--- a/net/spdy/spdy_http_utils.h
+++ b/net/spdy/spdy_http_utils.h
@@ -24,7 +24,7 @@ class HttpRequestHeaders;
 // Returns true if successfully converted.  False if the SpdyHeaderBlock is
 // incomplete (e.g. missing 'status' or 'version').
 bool SpdyHeadersToHttpResponse(const SpdyHeaderBlock& headers,
-                               int protocol_version,
+                               SpdyMajorVersion protocol_version,
                                HttpResponseInfo* response);
 
 // Create a SpdyHeaderBlock for a Spdy SYN_STREAM Frame from
@@ -33,13 +33,13 @@ void NET_EXPORT_PRIVATE CreateSpdyHeadersFromHttpRequest(
     const HttpRequestInfo& info,
     const HttpRequestHeaders& request_headers,
     SpdyHeaderBlock* headers,
-    int protocol_version,
+    SpdyMajorVersion protocol_version,
     bool direct);
 
 // Returns the URL associated with the |headers| by assembling the
 // scheme, host and path from the protocol specific keys.
 GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
-                           int protocol_version,
+                           SpdyMajorVersion protocol_version,
                            bool pushed);
 
 // Returns true if the value of this header should be displayed.
@@ -48,11 +48,11 @@ NET_EXPORT_PRIVATE bool ShouldShowHttpHeaderValue(
 
 NET_EXPORT_PRIVATE SpdyPriority ConvertRequestPriorityToSpdyPriority(
     RequestPriority priority,
-    int protocol_version);
+    SpdyMajorVersion protocol_version);
 
 NET_EXPORT_PRIVATE RequestPriority ConvertSpdyPriorityToRequestPriority(
     SpdyPriority priority,
-    int protocol_version);
+    SpdyMajorVersion protocol_version);
 
 }  // namespace net