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

net/quic/quic_http_utils.h

 // Copyright 2013 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.
 
 #ifndef NET_QUIC_QUIC_HTTP_UTILS_H_
 #define NET_QUIC_QUIC_HTTP_UTILS_H_
 
 #include "base/values.h"
 #include "net/base/net_export.h"
 #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
 
 #endif  // NET_QUIC_QUIC_HTTP_UTILS_H_