Land Recent QUIC changes.

net/tools/quic/test_tools/quic_test_client.cc

 // 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.
 
 #include "net/tools/quic/test_tools/quic_test_client.h"
 
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/x509_certificate.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/tools/flip_server/balsa_headers.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
+#include "net/tools/quic/quic_spdy_client_stream.h"
 #include "net/tools/quic/test_tools/http_message_test_utils.h"
 #include "url/gurl.h"
 
 using std::string;
 using std::vector;
 using base::StringPiece;
 
 namespace {
 
 // RecordingProofVerifier accepts any certificate chain and records the common
@@ skipping 127 matching lines @@
     : client_(new QuicEpollClient(address, hostname, config, version)) {
   Initialize(address, hostname, secure);
 }
 
 void QuicTestClient::Initialize(IPEndPoint address,
                                 const string& hostname,
                                 bool secure) {
   server_address_ = address;
   stream_ = NULL;
   stream_error_ = QUIC_STREAM_NO_ERROR;
+  priority_ = 3;
   bytes_read_ = 0;
   bytes_written_= 0;
   never_connected_ = true;
   secure_ = secure;
   auto_reconnect_ = false;
   proof_verifier_ = NULL;
   ExpectCertificates(secure_);
 }
 
 QuicTestClient::~QuicTestClient() {
@@ skipping 66 matching lines @@
   if (never_connected_ == true || auto_reconnect_) {
     if (!connected()) {
       Connect();
     }
     if (!connected()) {
       return NULL;
     }
   }
   if (!stream_) {
     stream_ = client_->CreateReliableClientStream();
-    if (stream_ != NULL) {
-      stream_->set_visitor(this);
+    if (stream_ == NULL) {
+      return NULL;
     }
+    stream_->set_visitor(this);
+    reinterpret_cast<QuicSpdyClientStream*>(stream_)->set_priority(priority_);
   }
+
   return stream_;
 }
 
 const string& QuicTestClient::cert_common_name() const {
   return reinterpret_cast<RecordingProofVerifier*>(proof_verifier_)
       ->common_name();
 }
 
 bool QuicTestClient::connected() const {
   return client_->connected();
@@ skipping 72 matching lines @@
 }
 
 void QuicTestClient::UseWriter(QuicTestWriter* writer) {
   DCHECK(!connected());
   reinterpret_cast<QuicEpollClient*>(client_.get())->UseWriter(writer);
 }
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net