Index: net/quic/quic_chromium_client_session.h |
diff --git a/net/quic/quic_chromium_client_session.h b/net/quic/quic_chromium_client_session.h |
index 31da6cc002d48da839519f9d1ffddd4ddb5bbf01..e47f41467889e7a81aaf0011eb68fc65dd943b1a 100644 |
--- a/net/quic/quic_chromium_client_session.h |
+++ b/net/quic/quic_chromium_client_session.h |
@@ -22,19 +22,19 @@ |
#include "net/base/socket_performance_watcher.h" |
#include "net/cert/ct_verify_result.h" |
#include "net/proxy/proxy_server.h" |
+#include "net/quic/quic_chromium_client_stream.h" |
#include "net/quic/quic_client_session_base.h" |
#include "net/quic/quic_connection_logger.h" |
#include "net/quic/quic_crypto_client_stream.h" |
#include "net/quic/quic_packet_reader.h" |
#include "net/quic/quic_protocol.h" |
-#include "net/quic/quic_reliable_client_stream.h" |
#include "net/quic/quic_time.h" |
namespace net { |
class CertVerifyResult; |
class DatagramClientSocket; |
-class QuicConnectionHelper; |
+class QuicChromiumConnectionHelper; |
class QuicCryptoClientStreamFactory; |
class QuicServerId; |
class QuicServerInfo; |
@@ -81,7 +81,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession |
// ERR_IO_PENDING is returned, then when the request is eventuallly |
// complete |callback| will be called. |
int StartRequest(const base::WeakPtr<QuicChromiumClientSession>& session, |
- QuicReliableClientStream** stream, |
+ QuicChromiumClientStream** stream, |
const CompletionCallback& callback); |
// Cancels any pending stream creation request. May be called |
@@ -93,7 +93,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession |
// Called by |session_| for an asynchronous request when the stream |
// request has finished successfully. |
- void OnRequestCompleteSuccess(QuicReliableClientStream* stream); |
+ void OnRequestCompleteSuccess(QuicChromiumClientStream* stream); |
// Called by |session_| for an asynchronous request when the stream |
// request has finished with an error. Also called with ERR_ABORTED |
@@ -102,7 +102,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession |
base::WeakPtr<QuicChromiumClientSession> session_; |
CompletionCallback callback_; |
- QuicReliableClientStream** stream_; |
+ QuicChromiumClientStream** stream_; |
DISALLOW_COPY_AND_ASSIGN(StreamRequest); |
}; |
@@ -142,7 +142,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession |
// TODO(rch): remove |stream| from this and use setter on |request| |
// and fix in spdy too. |
int TryCreateStream(StreamRequest* request, |
- QuicReliableClientStream** stream); |
+ QuicChromiumClientStream** stream); |
// Cancels the pending stream creation request. |
void CancelRequest(StreamRequest* request); |
@@ -152,7 +152,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession |
// QuicSession methods: |
void OnStreamFrame(const QuicStreamFrame& frame) override; |
- QuicReliableClientStream* CreateOutgoingDynamicStream( |
+ QuicChromiumClientStream* CreateOutgoingDynamicStream( |
SpdyPriority priority) override; |
QuicCryptoClientStream* GetCryptoStream() override; |
void CloseStream(QuicStreamId stream_id) override; |
@@ -250,7 +250,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession |
typedef std::set<Observer*> ObserverSet; |
typedef std::list<StreamRequest*> StreamRequestQueue; |
- QuicReliableClientStream* CreateOutgoingReliableStreamImpl(); |
+ QuicChromiumClientStream* CreateOutgoingReliableStreamImpl(); |
// A completion callback invoked when a read completes. |
void OnReadComplete(int result); |