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

net/tools/quic/test_tools/quic_test_client.h

Index: net/tools/quic/test_tools/quic_test_client.h
diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index 4d54f182410b3fb55143d8fcbbf70d01a898f746..f122e8bf6b35d5081f8b4eb8fd517afbdb33a8c0 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h
@@ -170,7 +170,7 @@ class QuicTestClient : public SimpleClient, public QuicSpdyStream::Visitor {
 
   void set_auto_reconnect(bool reconnect) { auto_reconnect_ = reconnect; }
 
-  void set_priority(QuicPriority priority) { priority_ = priority; }
+  void set_priority(SpdyPriority priority) { priority_ = priority; }
 
   // Sets client's FEC policy. This policy applies to the data stream(s), and
   // also to the headers and crypto streams.
@@ -226,7 +226,7 @@ class QuicTestClient : public SimpleClient, public QuicSpdyStream::Visitor {
   bool response_complete_;
   bool response_headers_complete_;
   mutable BalsaHeaders headers_;
-  QuicPriority priority_;
+  SpdyPriority priority_;
   std::string response_;
   uint64 bytes_read_;
   uint64 bytes_written_;