net/url_request/url_request_http_job.cc - Issue 8743019: base::Bind: Convert net::NetworkDelegate.

Unified Diff: net/url_request/url_request_http_job.cc

Issue 8743019: base::Bind: Convert net::NetworkDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month 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

Index: net/url_request/url_request_http_job.cc

diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc

index b5ef12da9d335fc7a1e4a1e4269ef781f71621ca..9e24f296075dcd9035b315504f63e78dd294703e 100644

--- a/net/url_request/url_request_http_job.cc

+++ b/net/url_request/url_request_http_job.cc

@@ -209,7 +209,8 @@ URLRequestHttpJob::URLRequestHttpJob(URLRequest* request)

ALLOW_THIS_IN_INITIALIZER_LIST(read_callback_(

this, &URLRequestHttpJob::OnReadCompleted)),

ALLOW_THIS_IN_INITIALIZER_LIST(notify_before_headers_sent_callback_(

- this, &URLRequestHttpJob::NotifyBeforeSendHeadersCallback)),

+ base::Bind(&URLRequestHttpJob::NotifyBeforeSendHeadersCallback,

+ this))),

csilv 2011/11/30 21:56:50 should 'this' be unretained? (ie typical callback

James Hawkins 2011/12/01 00:40:26 Done.

read_in_progress_(false),

transaction_(NULL),

throttling_entry_(URLRequestThrottlerManager::GetInstance()->

@@ -228,9 +229,8 @@ URLRequestHttpJob::URLRequestHttpJob(URLRequest* request)

filter_context_(new HttpFilterContext(this))),

ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),

weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),

- ALLOW_THIS_IN_INITIALIZER_LIST(

- on_headers_received_callback_(

- this, &URLRequestHttpJob::OnHeadersReceivedCallback)),

+ ALLOW_THIS_IN_INITIALIZER_LIST(on_headers_received_callback_(

+ base::Bind(&URLRequestHttpJob::OnHeadersReceivedCallback, this))),

csilv 2011/11/30 21:56:50 ditto

James Hawkins 2011/12/01 00:40:26 Done.

awaiting_callback_(false) {

ResetTimer();

}

@@ -305,7 +305,7 @@ void URLRequestHttpJob::DestroyTransaction() {

void URLRequestHttpJob::StartTransaction() {

if (request_->context() && request_->context()->network_delegate()) {

int rv = request_->context()->network_delegate()->NotifyBeforeSendHeaders(

- request_, &notify_before_headers_sent_callback_,

+ request_, notify_before_headers_sent_callback_,

&request_info_.extra_headers);

// If an extension blocks the request, we rely on the callback to

// StartTransactionInternal().

@@ -714,7 +714,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) {

// |on_headers_received_callback_| or

// |NetworkDelegate::URLRequestDestroyed()| has been called.

int error = request_->context()->network_delegate()->

- NotifyHeadersReceived(request_, &on_headers_received_callback_,

+ NotifyHeadersReceived(request_, on_headers_received_callback_,

headers, &override_response_headers_);

if (error != net::OK) {

if (error == net::ERR_IO_PENDING) {

« net/base/network_delegate.cc ('K') | « net/url_request/url_request_http_job.h ('k') | net/url_request/url_request_test_util.h » ('j') | net/url_request/url_request_unittest.cc » ('J')