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

Unified Diff: net/http/http_proxy_client_socket.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 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_pipelined_connection_impl.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket.cc
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index 6c642a6b3c530f12d0c1813bf9fc0686ed3bdfcb..fc9c2b3734459e10d893a3d7a6080ce03950808d 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -95,7 +95,7 @@ NextProto HttpProxyClientSocket::GetProtocolNegotiated() const {
}
const HttpResponseInfo* HttpProxyClientSocket::GetConnectResponseInfo() const {
- return response_.headers ? &response_ : NULL;
+ return response_.headers.get() ? &response_ : NULL;
}
HttpStream* HttpProxyClientSocket::CreateConnectResponseStream() {
@@ -414,8 +414,8 @@ int HttpProxyClientSocket::DoSendRequest() {
}
parser_buf_ = new GrowableIOBuffer();
- http_stream_parser_.reset(
- new HttpStreamParser(transport_.get(), &request_, parser_buf_, net_log_));
+ http_stream_parser_.reset(new HttpStreamParser(
+ transport_.get(), &request_, parser_buf_.get(), net_log_));
return http_stream_parser_->SendRequest(
request_line_, request_headers_, &response_, io_callback_);
}
@@ -478,7 +478,7 @@ int HttpProxyClientSocket::DoReadHeadersComplete(int result) {
// authentication code is smart enough to avoid being tricked by an
// active network attacker.
// The next state is intentionally not set as it should be STATE_NONE;
- return HandleProxyAuthChallenge(auth_, &response_, net_log_);
+ return HandleProxyAuthChallenge(auth_.get(), &response_, net_log_);
default:
// Ignore response to avoid letting the proxy impersonate the target
@@ -493,11 +493,11 @@ int HttpProxyClientSocket::DoReadHeadersComplete(int result) {
}
int HttpProxyClientSocket::DoDrainBody() {
- DCHECK(drain_buf_);
+ DCHECK(drain_buf_.get());
DCHECK(transport_->is_initialized());
next_state_ = STATE_DRAIN_BODY_COMPLETE;
- return http_stream_parser_->ReadResponseBody(drain_buf_, kDrainBodyBufferSize,
- io_callback_);
+ return http_stream_parser_->ReadResponseBody(
+ drain_buf_.get(), kDrainBodyBufferSize, io_callback_);
}
int HttpProxyClientSocket::DoDrainBodyComplete(int result) {
« no previous file with comments | « net/http/http_pipelined_connection_impl.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698