Land Recent QUIC changes.

net/quic/quic_http_stream.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_QUIC_HTTP_STREAM_H_
 #define NET_QUIC_QUIC_HTTP_STREAM_H_
 
 #include <list>
 
 #include "base/memory/weak_ptr.h"
 #include "net/base/io_buffer.h"
 #include "net/http/http_stream.h"
 #include "net/quic/quic_client_session.h"
 #include "net/quic/quic_reliable_client_stream.h"
 
 namespace net {
 
+namespace test {
+class QuicHttpStreamPeer;
+}  // namespace test
+
 // The QuicHttpStream is a QUIC-specific HttpStream subclass.  It holds a
 // non-owning pointer to a QuicReliableClientStream which it uses to
 // send and receive data.
 class NET_EXPORT_PRIVATE QuicHttpStream :
       public QuicReliableClientStream::Delegate,
       public HttpStream {
  public:
   explicit QuicHttpStream(const base::WeakPtr<QuicClientSession> session);
 
   virtual ~QuicHttpStream();
@@ skipping 27 matching lines @@
   virtual bool IsSpdyHttpStream() const OVERRIDE;
   virtual void Drain(HttpNetworkSession* session) OVERRIDE;
   virtual void SetPriority(RequestPriority priority) OVERRIDE;
 
   // QuicReliableClientStream::Delegate implementation
   virtual int OnSendData() OVERRIDE;
   virtual int OnSendDataComplete(int status, bool* eof) OVERRIDE;
   virtual int OnDataReceived(const char* data, int length) OVERRIDE;
   virtual void OnClose(QuicErrorCode error) OVERRIDE;
   virtual void OnError(int error) OVERRIDE;
+  virtual bool HasSendHeadersComplete() OVERRIDE;
 
  private:
+  friend class test::QuicHttpStreamPeer;
+
   enum State {
     STATE_NONE,
     STATE_SEND_HEADERS,
     STATE_SEND_HEADERS_COMPLETE,
     STATE_READ_REQUEST_BODY,
     STATE_READ_REQUEST_BODY_COMPLETE,
     STATE_SEND_BODY,
     STATE_SEND_BODY_COMPLETE,
     STATE_OPEN,
   };
@@ skipping 22 matching lines @@
   QuicClientSession::StreamRequest stream_request_;
   QuicReliableClientStream* stream_;  // Non-owning.
 
   // The following three fields are all owned by the caller and must
   // outlive this object, according to the HttpStream contract.
 
   // The request to send.
   const HttpRequestInfo* request_info_;
   // The request body to send, if any, owned by the caller.
   UploadDataStream* request_body_stream_;
+  // The priority of the request.
+  RequestPriority priority_;
   // |response_info_| is the HTTP response data object which is filled in
   // when a the response headers are read.  It is not owned by this stream.
   HttpResponseInfo* response_info_;
   // Because response data is buffered, also buffer the response status if the
   // stream is explicitly closed via OnError or OnClose with an error.
   // Once all buffered data has been returned, this will be used as the final
   // response.
   int response_status_;
 
   bool response_headers_received_;
@@ skipping 21 matching lines @@
   scoped_refptr<DrainableIOBuffer> request_body_buf_;
 
   BoundNetLog stream_net_log_;
 
   base::WeakPtrFactory<QuicHttpStream> weak_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_HTTP_STREAM_H_