Landing Recent QUIC changes until and including Mon Nov 16 14:15:48 2015

net/quic/quic_http_utils.h

Index: net/quic/quic_http_utils.h
diff --git a/net/quic/quic_http_utils.h b/net/quic/quic_http_utils.h
index 82306d63ce26c5029d6a923d694be7f386757c1e..1bde98a631bdbdf1db0f373d5104156095d99ef5 100644
--- a/net/quic/quic_http_utils.h
+++ b/net/quic/quic_http_utils.h
@@ -10,20 +10,21 @@
 #include "net/base/request_priority.h"
 #include "net/quic/quic_protocol.h"
 #include "net/spdy/spdy_header_block.h"
+#include "net/spdy/spdy_protocol.h"
 
 namespace net {
 
-NET_EXPORT_PRIVATE QuicPriority ConvertRequestPriorityToQuicPriority(
-    RequestPriority priority);
+NET_EXPORT_PRIVATE SpdyPriority
+ConvertRequestPriorityToQuicPriority(RequestPriority priority);
 
-NET_EXPORT_PRIVATE RequestPriority ConvertQuicPriorityToRequestPriority(
-    QuicPriority priority);
+NET_EXPORT_PRIVATE RequestPriority
+ConvertQuicPriorityToRequestPriority(SpdyPriority priority);
 
 // Converts a SpdyHeaderBlock and priority into NetLog event parameters.
 NET_EXPORT scoped_ptr<base::Value> QuicRequestNetLogCallback(
     QuicStreamId stream_id,
     const SpdyHeaderBlock* headers,
-    QuicPriority priority,
+    SpdyPriority priority,
     NetLogCaptureMode capture_mode);
 
 }  // namespace net