Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(886)

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 440293003: Return ERR_NOT_IMPLEMENTED when we reach SPDY stream creation code in a factory for WebSocket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use ERR_NOT_IMPLEMENTED Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 82d7ed348ba08d7011bac70449d6f882859b9de2..cad818be76dd9d76ecd5685e10a7ea444b9f29e6 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -1122,13 +1122,14 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() {
// HttpStreamFactoryImpl will be creating all the SpdyHttpStreams, since it
// will know when SpdySessions become available.
- if (stream_factory_->for_websockets_) {
- // TODO(ricea): Restore this code when WebSockets over SPDY is implemented.
- NOTREACHED();
- } else {
- bool use_relative_url = direct || request_info_.url.SchemeIs("https");
- stream_.reset(new SpdyHttpStream(spdy_session, use_relative_url));
- }
+ // TODO(ricea): Restore the code for WebSockets over SPDY once it's
+ // implemented.
+ if (stream_factory_->for_websockets_)
+ return ERR_NOT_IMPLEMENTED;
+
+ bool use_relative_url = direct || request_info_.url.SchemeIs("https");
+ stream_.reset(new SpdyHttpStream(spdy_session, use_relative_url));
+
return OK;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698