Chromium Code Reviews| Index: net/http/http_cache_transaction.cc |
| diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc |
| index 896db76e1586ab01e41e74120ba83da8b6017633..8cbcc8b05c7eb1102ae2ba37b0ab5b5a57f73746 100644 |
| --- a/net/http/http_cache_transaction.cc |
| +++ b/net/http/http_cache_transaction.cc |
| @@ -442,7 +442,10 @@ int HttpCache::Transaction::Start(const HttpRequestInfo* request, |
| // Setting this here allows us to check for the existence of a callback_ to |
| // determine if we are still inside Start. |
| if (rv == ERR_IO_PENDING) |
|
gavinp
2014/12/03 01:17:13
You need curly braces here now, see http://google-
vadimt
2014/12/03 01:41:53
Done.
|
| - callback_ = callback; |
| + callback_ = tracked_objects::ScopedTracker::TrackCallback( |
| + FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| + "422516 HttpCache::Transaction::Start"), |
| + callback); |
| return rv; |
| } |
| @@ -460,7 +463,10 @@ int HttpCache::Transaction::RestartIgnoringLastError( |
| int rv = RestartNetworkRequest(); |
| if (rv == ERR_IO_PENDING) |
| - callback_ = callback; |
| + callback_ = tracked_objects::ScopedTracker::TrackCallback( |
| + FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| + "422516 HttpCache::Transaction::RestartIgnoringLastError"), |
| + callback); |
| return rv; |
| } |
| @@ -479,7 +485,10 @@ int HttpCache::Transaction::RestartWithCertificate( |
| int rv = RestartNetworkRequestWithCertificate(client_cert); |
| if (rv == ERR_IO_PENDING) |
| - callback_ = callback; |
| + callback_ = tracked_objects::ScopedTracker::TrackCallback( |
| + FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| + "422516 HttpCache::Transaction::RestartWithCertificate"), |
| + callback); |
| return rv; |
| } |
| @@ -502,7 +511,10 @@ int HttpCache::Transaction::RestartWithAuth( |
| int rv = RestartNetworkRequestWithAuth(credentials); |
| if (rv == ERR_IO_PENDING) |
| - callback_ = callback; |
| + callback_ = tracked_objects::ScopedTracker::TrackCallback( |
| + FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| + "422516 HttpCache::Transaction::RestartWithAuth"), |
| + callback); |
| return rv; |
| } |
| @@ -560,7 +572,9 @@ int HttpCache::Transaction::Read(IOBuffer* buf, int buf_len, |
| if (rv == ERR_IO_PENDING) { |
| DCHECK(callback_.is_null()); |
| - callback_ = callback; |
| + callback_ = tracked_objects::ScopedTracker::TrackCallback( |
| + FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 HttpCache::Transaction::Read"), |
| + callback); |
| } |
| return rv; |
| } |
| @@ -699,6 +713,11 @@ int HttpCache::Transaction::ResumeNetworkStart() { |
| //----------------------------------------------------------------------------- |
| void HttpCache::Transaction::DoCallback(int rv) { |
| + // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed. |
| + tracked_objects::ScopedTracker tracking_profile( |
| + FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| + "422516 HttpCache::Transaction::DoCallback")); |
| + |
| DCHECK(rv != ERR_IO_PENDING); |
| DCHECK(!callback_.is_null()); |