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

net/tools/quic/test_tools/quic_test_client.h

 // Copyright (c) 2012 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_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 152 matching lines @@
 
   // cert_sct returns the signed timestamp of the server's certificate,
   // or the empty string if no signed timestamp was presented.
   const std::string& cert_sct() const;
 
   // Get the server config map.
   QuicTagValueMap GetServerConfig() const;
 
   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.
   void SetFecPolicy(FecPolicy fec_policy);
 
   void WaitForWriteToFlush();
 
   EpollServer* epoll_server() { return &epoll_server_; }
 
   void set_allow_bidirectional_data(bool value) {
@@ skipping 35 matching lines @@
 
   EpollServer epoll_server_;
   scoped_ptr<MockableQuicClient> client_;  // The actual client
   QuicSpdyClientStream* stream_;
 
   QuicRstStreamErrorCode stream_error_;
 
   bool response_complete_;
   bool response_headers_complete_;
   mutable BalsaHeaders headers_;
-  QuicPriority priority_;
+  SpdyPriority priority_;
   std::string response_;
   uint64 bytes_read_;
   uint64 bytes_written_;
   // The number of uncompressed HTTP header bytes received.
   int response_header_size_;
   // The number of HTTP body bytes received.
   int64 response_body_size_;
   // True if we tried to connect already since the last call to Disconnect().
   bool connect_attempted_;
   // The client will auto-connect exactly once before sending data.  If
@@ skipping 10 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestClient);
 };
 
 }  // namespace test
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_