Index: net/http/bidirectional_stream.h |
diff --git a/net/http/bidirectional_stream.h b/net/http/bidirectional_stream.h |
index 78aeeafe7035f466f552162c2052aab1c398c800..7e6152a48f9d699b62d8853419dfdde9267e1e51 100644 |
--- a/net/http/bidirectional_stream.h |
+++ b/net/http/bidirectional_stream.h |
@@ -10,7 +10,7 @@ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
-#include "net/http/bidirectional_stream_job.h" |
+#include "net/http/bidirectional_stream_impl.h" |
#include "net/http/http_stream_factory.h" |
#include "net/log/net_log.h" |
@@ -32,7 +32,7 @@ struct SSLConfig; |
// ReadData or SendData should be in flight until the operation completes. |
// The BidirectionalStream must be torn down before the HttpNetworkSession. |
class NET_EXPORT BidirectionalStream |
- : public NON_EXPORTED_BASE(BidirectionalStreamJob::Delegate), |
+ : public NON_EXPORTED_BASE(BidirectionalStreamImpl::Delegate), |
public NON_EXPORTED_BASE(HttpStreamRequest::Delegate) { |
public: |
// Delegate interface to get notified of success of failure. Callbacks will be |
@@ -102,7 +102,7 @@ class NET_EXPORT BidirectionalStream |
Delegate* delegate, |
scoped_ptr<base::Timer> timer); |
- // Cancels |stream_request_| or |stream_job_| if applicable. |
+ // Cancels |stream_request_| or |stream_impl_| if applicable. |
// |this| should not be destroyed during Delegate::OnHeadersSent or |
// Delegate::OnDataSent. |
~BidirectionalStream() override; |
@@ -121,7 +121,7 @@ class NET_EXPORT BidirectionalStream |
// flag. |
void SendData(IOBuffer* data, int length, bool end_stream); |
- // If |stream_request_| is non-NULL, cancel it. If |stream_job_| is |
+ // If |stream_request_| is non-NULL, cancel it. If |stream_impl_| is |
// established, cancel it. No delegate method will be called after Cancel(). |
// Any pending operations may or may not succeed. |
void Cancel(); |
@@ -146,7 +146,7 @@ class NET_EXPORT BidirectionalStream |
// remote end point. |
private: |
- // BidirectionalStreamJob::Delegate implementation: |
+ // BidirectionalStreamImpl::Delegate implementation: |
void OnHeadersSent() override; |
void OnHeadersReceived(const SpdyHeaderBlock& response_headers) override; |
void OnDataRead(int bytes_read) override; |
@@ -158,9 +158,10 @@ class NET_EXPORT BidirectionalStream |
void OnStreamReady(const SSLConfig& used_ssl_config, |
const ProxyInfo& used_proxy_info, |
HttpStream* stream) override; |
- void OnBidirectionalStreamJobReady(const SSLConfig& used_ssl_config, |
- const ProxyInfo& used_proxy_info, |
- BidirectionalStreamJob* stream) override; |
+ void OnBidirectionalStreamImplReady( |
+ const SSLConfig& used_ssl_config, |
+ const ProxyInfo& used_proxy_info, |
+ BidirectionalStreamImpl* stream_impl) override; |
void OnWebSocketHandshakeStreamReady( |
const SSLConfig& used_ssl_config, |
const ProxyInfo& used_proxy_info, |
@@ -194,12 +195,12 @@ class NET_EXPORT BidirectionalStream |
// Timer used to buffer data received in short time-spans and send a single |
// read completion notification. |
scoped_ptr<base::Timer> timer_; |
- // HttpStreamRequest used to request a BidirectionalStreamJob. This is NULL if |
- // the request has been canceled or completed. |
+ // HttpStreamRequest used to request a BidirectionalStreamImpl. This is NULL |
+ // if the request has been canceled or completed. |
scoped_ptr<HttpStreamRequest> stream_request_; |
- // The underlying BidirectioanlStreamJob used for this stream. It is non-NULL, |
- // if the |stream_request_| successfully finishes. |
- scoped_ptr<BidirectionalStreamJob> stream_job_; |
+ // The underlying BidirectioanlStreamImpl used for this stream. It is |
+ // non-NULL, if the |stream_request_| successfully finishes. |
+ scoped_ptr<BidirectionalStreamImpl> stream_impl_; |
DISALLOW_COPY_AND_ASSIGN(BidirectionalStream); |
}; |