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

Unified Diff: net/http/http_proxy_client_socket.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 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_network_session.h ('k') | net/http/http_response_body_drainer.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 9b577700ce1910c12d8e37e2138c0d7f5453d871..8b2bf2b9e7545d4619cedcf1eb4a5a910cbf8984 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -97,7 +97,7 @@ NextProto HttpProxyClientSocket::GetProtocolNegotiated() const {
}
const HttpResponseInfo* HttpProxyClientSocket::GetConnectResponseInfo() const {
- return response_.headers ? &response_ : NULL;
+ return response_.headers.get() ? &response_ : NULL;
}
HttpStream* HttpProxyClientSocket::CreateConnectResponseStream() {
@@ -433,7 +433,8 @@ int HttpProxyClientSocket::DoSendRequest() {
parser_buf_ = new GrowableIOBuffer();
http_stream_parser_.reset(
- new HttpStreamParser(transport_.get(), &request_, parser_buf_, net_log_));
+ new HttpStreamParser(
+ transport_.get(), &request_, parser_buf_.get(), net_log_));
return http_stream_parser_->SendRequest(
request_line_, request_headers_, scoped_ptr<UploadDataStream>(),
&response_, io_callback_);
@@ -497,7 +498,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
@@ -515,8 +516,9 @@ int HttpProxyClientSocket::DoDrainBody() {
DCHECK(drain_buf_);
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_network_session.h ('k') | net/http/http_response_body_drainer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698