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

net/quic/quic_http_utils.cc

Index: net/quic/quic_http_utils.cc
diff --git a/net/quic/quic_http_utils.cc b/net/quic/quic_http_utils.cc
index 60fbd9a4a7f7371fa454b920f4c84aa7ee727bf4..856427beb0db4d7103bcc1500e26f3a3bdfbaf13 100644
--- a/net/quic/quic_http_utils.cc
+++ b/net/quic/quic_http_utils.cc
@@ -6,15 +6,15 @@
 
 namespace net {
 
-QuicPriority ConvertRequestPriorityToQuicPriority(
+SpdyPriority ConvertRequestPriorityToQuicPriority(
     const RequestPriority priority) {
   DCHECK_GE(priority, MINIMUM_PRIORITY);
   DCHECK_LE(priority, MAXIMUM_PRIORITY);
-  return static_cast<QuicPriority>(HIGHEST - priority);
+  return static_cast<SpdyPriority>(HIGHEST - priority);
 }
 
-NET_EXPORT_PRIVATE RequestPriority ConvertQuicPriorityToRequestPriority(
-    QuicPriority priority) {
+NET_EXPORT_PRIVATE RequestPriority
+ConvertQuicPriorityToRequestPriority(SpdyPriority priority) {
   // Handle invalid values gracefully.
   return (priority >= 5) ?
       IDLE : static_cast<RequestPriority>(HIGHEST - priority);
@@ -23,7 +23,7 @@ NET_EXPORT_PRIVATE RequestPriority ConvertQuicPriorityToRequestPriority(
 scoped_ptr<base::Value> QuicRequestNetLogCallback(
     QuicStreamId stream_id,
     const SpdyHeaderBlock* headers,
-    QuicPriority priority,
+    SpdyPriority priority,
     NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(static_cast<base::DictionaryValue*>(
       SpdyHeaderBlockNetLogCallback(headers, capture_mode).release()));