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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_request.cc » ('j') | 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 5f4f6d57b48cfd386de7d4fa0d235b2e8d6a02c7..63160d02ef0cc2ba838bcc2d7d7f621b310cfcb9 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -399,11 +399,15 @@ void HttpStreamFactoryImpl::Job::OnHttpsProxyTunnelResponseCallback(
void HttpStreamFactoryImpl::Job::OnPreconnectsComplete() {
DCHECK(!request_);
- if (new_spdy_session_) {
- stream_factory_->OnNewSpdySessionReady(
- new_spdy_session_, spdy_session_direct_, server_ssl_config_,
- proxy_info_, was_npn_negotiated(), protocol_negotiated(), using_spdy(),
- net_log_);
+ if (new_spdy_session_.get()) {
+ stream_factory_->OnNewSpdySessionReady(new_spdy_session_,
+ spdy_session_direct_,
+ server_ssl_config_,
+ proxy_info_,
+ was_npn_negotiated(),
+ protocol_negotiated(),
+ using_spdy(),
+ net_log_);
}
stream_factory_->OnPreconnectsComplete(this);
// |this| may be deleted after this call.
@@ -512,12 +516,11 @@ int HttpStreamFactoryImpl::Job::RunLoop(int result) {
case OK:
next_state_ = STATE_DONE;
- if (new_spdy_session_) {
+ if (new_spdy_session_.get()) {
base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(
- &Job::OnNewSpdySessionReadyCallback,
- ptr_factory_.GetWeakPtr()));
+ base::Bind(&Job::OnNewSpdySessionReadyCallback,
+ ptr_factory_.GetWeakPtr()));
} else if (stream_factory_->for_websockets_) {
DCHECK(websocket_stream_);
base::MessageLoop::current()->PostTask(
@@ -1126,10 +1129,10 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() {
bool use_relative_url = direct || request_info_.url.SchemeIs("wss");
websocket_stream_.reset(
request_->websocket_stream_factory()->CreateSpdyStream(
- spdy_session, use_relative_url));
+ spdy_session.get(), use_relative_url));
} else {
bool use_relative_url = direct || request_info_.url.SchemeIs("https");
- stream_.reset(new SpdyHttpStream(spdy_session, use_relative_url));
+ stream_.reset(new SpdyHttpStream(spdy_session.get(), use_relative_url));
}
return OK;
}
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698