| Index: net/http/http_stream_factory_impl_request.cc
|
| diff --git a/net/http/http_stream_factory_impl_request.cc b/net/http/http_stream_factory_impl_request.cc
|
| index a335a55dcdbc2f54276595373bbed8e8e942128a..59b7b44c4acc5143885ca09a978a73b1eba021da 100644
|
| --- a/net/http/http_stream_factory_impl_request.cc
|
| +++ b/net/http/http_stream_factory_impl_request.cc
|
| @@ -35,7 +35,7 @@
|
| was_npn_negotiated_(false),
|
| protocol_negotiated_(kProtoUnknown),
|
| using_spdy_(false),
|
| - stream_type_(stream_type) {
|
| + for_bidirectional_(stream_type == BIDIRECTIONAL_STREAM_SPDY_JOB) {
|
| DCHECK(factory_);
|
| DCHECK(delegate_);
|
|
|
| @@ -83,7 +83,7 @@
|
| const ProxyInfo& used_proxy_info,
|
| HttpStream* stream) {
|
| DCHECK(!factory_->for_websockets_);
|
| - DCHECK_EQ(HttpStreamRequest::HTTP_STREAM, stream_type_);
|
| + DCHECK(!for_bidirectional_);
|
| DCHECK(stream);
|
| DCHECK(completed_);
|
|
|
| @@ -97,7 +97,7 @@
|
| const ProxyInfo& used_proxy_info,
|
| BidirectionalStreamJob* stream_job) {
|
| DCHECK(!factory_->for_websockets_);
|
| - DCHECK_EQ(HttpStreamRequest::BIDIRECTIONAL_STREAM, stream_type_);
|
| + DCHECK(for_bidirectional_);
|
| DCHECK(stream_job);
|
| DCHECK(completed_);
|
|
|
| @@ -112,7 +112,7 @@
|
| const ProxyInfo& used_proxy_info,
|
| WebSocketHandshakeStreamBase* stream) {
|
| DCHECK(factory_->for_websockets_);
|
| - DCHECK_EQ(HttpStreamRequest::HTTP_STREAM, stream_type_);
|
| + DCHECK(!for_bidirectional_);
|
| DCHECK(stream);
|
| DCHECK(completed_);
|
|
|
| @@ -314,7 +314,7 @@
|
| // TODO(ricea): Re-instate this code when WebSockets over SPDY is
|
| // implemented.
|
| NOTREACHED();
|
| - } else if (stream_type_ == HttpStreamRequest::BIDIRECTIONAL_STREAM) {
|
| + } else if (for_bidirectional_) {
|
| DCHECK(bidirectional_stream_job);
|
| DCHECK(!stream);
|
| #if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM)
|
|
|