Land Recent QUIC changes.

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_QUIC_TEST_TOOLS_QUIC_CLIENT_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 89 matching lines @@
 
   // cert_common_name returns the common name value of the server's certificate,
   // or the empty string if no certificate was presented.
   const string& cert_common_name() const;
 
   const string& response_body() {return response_;}
   bool connected() const;
 
   void set_auto_reconnect(bool reconnect) { auto_reconnect_ = reconnect; }
 
+  void set_priority(QuicPriority priority) { priority_ = priority; }
+
  private:
   void Initialize(IPEndPoint address, const string& hostname, bool secure);
 
   IPEndPoint server_address_;
   IPEndPoint client_address_;
   scoped_ptr<QuicClient> client_;  // The actual client
   QuicReliableClientStream* stream_;
 
   QuicRstStreamErrorCode stream_error_;
 
   BalsaHeaders headers_;
+  QuicPriority priority_;
+
   string response_;
   uint64 bytes_read_;
   uint64 bytes_written_;
   // True if the client has never connected before.  The client will
   // auto-connect exactly once before sending data.  If something causes a
   // connection reset, it will not automatically reconnect.
   bool never_connected_;
   bool secure_;
   // If true, the client will always reconnect if necessary before creating a
   // stream.
   bool auto_reconnect_;
 
   // proof_verifier_ points to a RecordingProofVerifier that is owned by
   // client_.
   ProofVerifier* proof_verifier_;
 };
 
 }  // namespace test
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_CLIENT_H_