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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_cache_transaction.cc

Issue 1062413002: Remove unnecessary instrumentation for several jank bugs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fixes Created 5 years, 8 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_cache.cc ('k') | net/http/partial_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_cache_transaction.cc
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index 009ed4a258fff8bbac52a86e29e848e6d9babdce..5d6dc4d80de37627f94e09a8eb3cabd89e898b8a 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -441,12 +441,8 @@ 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) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::Start"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -463,12 +459,8 @@ int HttpCache::Transaction::RestartIgnoringLastError(
int rv = RestartNetworkRequest();
- if (rv == ERR_IO_PENDING) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::RestartIgnoringLastError"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -486,12 +478,8 @@ int HttpCache::Transaction::RestartWithCertificate(
int rv = RestartNetworkRequestWithCertificate(client_cert);
- if (rv == ERR_IO_PENDING) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::RestartWithCertificate"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -513,12 +501,8 @@ int HttpCache::Transaction::RestartWithAuth(
int rv = RestartNetworkRequestWithAuth(credentials);
- if (rv == ERR_IO_PENDING) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::RestartWithAuth"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -576,9 +560,7 @@ int HttpCache::Transaction::Read(IOBuffer* buf, int buf_len,
if (rv == ERR_IO_PENDING) {
DCHECK(callback_.is_null());
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 HttpCache::Transaction::Read"),
- callback);
+ callback_ = callback;
}
return rv;
}
@@ -717,11 +699,6 @@ 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());
@@ -1037,11 +1014,6 @@ int HttpCache::Transaction::DoLoop(int result) {
}
int HttpCache::Transaction::DoGetBackend() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoGetBackend"));
-
cache_pending_ = true;
next_state_ = STATE_GET_BACKEND_COMPLETE;
net_log_.BeginEvent(NetLog::TYPE_HTTP_CACHE_GET_BACKEND);
@@ -1049,11 +1021,6 @@ int HttpCache::Transaction::DoGetBackend() {
}
int HttpCache::Transaction::DoGetBackendComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoGetBackendComplete"));
-
DCHECK(result == OK || result == ERR_FAILED);
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_GET_BACKEND,
result);
@@ -1119,11 +1086,6 @@ int HttpCache::Transaction::DoGetBackendComplete(int result) {
}
int HttpCache::Transaction::DoSendRequest() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoSendRequest"));
-
DCHECK(mode_ & WRITE || mode_ == NONE);
DCHECK(!network_trans_.get());
@@ -1151,11 +1113,6 @@ int HttpCache::Transaction::DoSendRequest() {
}
int HttpCache::Transaction::DoSendRequestComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoSendRequestComplete"));
-
if (!cache_.get())
return ERR_UNEXPECTED;
@@ -1211,11 +1168,6 @@ int HttpCache::Transaction::DoSendRequestComplete(int result) {
// We received the response headers and there is no error.
int HttpCache::Transaction::DoSuccessfulSendRequest() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoSuccessfulSendRequest"));
-
DCHECK(!new_response_);
const HttpResponseInfo* new_response = network_trans_->GetResponseInfo();
bool authentication_failure = false;
@@ -1318,21 +1270,11 @@ int HttpCache::Transaction::DoSuccessfulSendRequest() {
}
int HttpCache::Transaction::DoNetworkRead() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoNetworkRead"));
-
next_state_ = STATE_NETWORK_READ_COMPLETE;
return network_trans_->Read(read_buf_.get(), io_buf_len_, io_callback_);
}
int HttpCache::Transaction::DoNetworkReadComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoNetworkReadComplete"));
-
DCHECK(mode_ & WRITE || mode_ == NONE);
if (!cache_.get())
@@ -1348,11 +1290,6 @@ int HttpCache::Transaction::DoNetworkReadComplete(int result) {
}
int HttpCache::Transaction::DoInitEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoInitEntry"));
-
DCHECK(!new_entry_);
if (!cache_.get())
@@ -1368,11 +1305,6 @@ int HttpCache::Transaction::DoInitEntry() {
}
int HttpCache::Transaction::DoOpenEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoOpenEntry"));
-
DCHECK(!new_entry_);
next_state_ = STATE_OPEN_ENTRY_COMPLETE;
cache_pending_ = true;
@@ -1382,11 +1314,6 @@ int HttpCache::Transaction::DoOpenEntry() {
}
int HttpCache::Transaction::DoOpenEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoOpenEntryComplete"));
-
// It is important that we go to STATE_ADD_TO_ENTRY whenever the result is
// OK, otherwise the cache will end up with an active entry without any
// transaction attached.
@@ -1428,11 +1355,6 @@ int HttpCache::Transaction::DoOpenEntryComplete(int result) {
}
int HttpCache::Transaction::DoCreateEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCreateEntry"));
-
DCHECK(!new_entry_);
next_state_ = STATE_CREATE_ENTRY_COMPLETE;
cache_pending_ = true;
@@ -1441,11 +1363,6 @@ int HttpCache::Transaction::DoCreateEntry() {
}
int HttpCache::Transaction::DoCreateEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCreateEntryComplete"));
-
// It is important that we go to STATE_ADD_TO_ENTRY whenever the result is
// OK, otherwise the cache will end up with an active entry without any
// transaction attached.
@@ -1474,11 +1391,6 @@ int HttpCache::Transaction::DoCreateEntryComplete(int result) {
}
int HttpCache::Transaction::DoDoomEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoDoomEntry"));
-
next_state_ = STATE_DOOM_ENTRY_COMPLETE;
cache_pending_ = true;
if (first_cache_access_since_.is_null())
@@ -1488,11 +1400,6 @@ int HttpCache::Transaction::DoDoomEntry() {
}
int HttpCache::Transaction::DoDoomEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoDoomEntryComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_DOOM_ENTRY, result);
next_state_ = STATE_CREATE_ENTRY;
cache_pending_ = false;
@@ -1502,11 +1409,6 @@ int HttpCache::Transaction::DoDoomEntryComplete(int result) {
}
int HttpCache::Transaction::DoAddToEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoAddToEntry"));
-
DCHECK(new_entry_);
cache_pending_ = true;
next_state_ = STATE_ADD_TO_ENTRY_COMPLETE;
@@ -1548,11 +1450,6 @@ int HttpCache::Transaction::DoAddToEntry() {
}
int HttpCache::Transaction::DoAddToEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoAddToEntryComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY,
result);
const TimeDelta entry_lock_wait =
@@ -1604,11 +1501,6 @@ int HttpCache::Transaction::DoAddToEntryComplete(int result) {
// We may end up here multiple times for a given request.
int HttpCache::Transaction::DoStartPartialCacheValidation() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoStartPartialCacheValidation"));
-
if (mode_ == NONE)
return OK;
@@ -1617,11 +1509,6 @@ int HttpCache::Transaction::DoStartPartialCacheValidation() {
}
int HttpCache::Transaction::DoCompletePartialCacheValidation(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCompletePartialCacheValidation"));
-
if (!result) {
// This is the end of the request.
if (mode_ & WRITE) {
@@ -1649,11 +1536,6 @@ int HttpCache::Transaction::DoCompletePartialCacheValidation(int result) {
// We received 304 or 206 and we want to update the cached response headers.
int HttpCache::Transaction::DoUpdateCachedResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoUpdateCachedResponse"));
-
next_state_ = STATE_UPDATE_CACHED_RESPONSE_COMPLETE;
int rv = OK;
// Update cached response based on headers in new_response.
@@ -1691,11 +1573,6 @@ int HttpCache::Transaction::DoUpdateCachedResponse() {
}
int HttpCache::Transaction::DoUpdateCachedResponseComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoUpdateCachedResponseComplete"));
-
if (mode_ == UPDATE) {
DCHECK(!handling_206_);
// We got a "not modified" response and already updated the corresponding
@@ -1729,11 +1606,6 @@ int HttpCache::Transaction::DoUpdateCachedResponseComplete(int result) {
}
int HttpCache::Transaction::DoOverwriteCachedResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoOverwriteCachedResponse"));
-
if (mode_ & READ) {
next_state_ = STATE_PARTIAL_HEADERS_RECEIVED;
return OK;
@@ -1770,11 +1642,6 @@ int HttpCache::Transaction::DoOverwriteCachedResponse() {
}
int HttpCache::Transaction::DoTruncateCachedData() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedData"));
-
next_state_ = STATE_TRUNCATE_CACHED_DATA_COMPLETE;
if (!entry_)
return OK;
@@ -1785,11 +1652,6 @@ int HttpCache::Transaction::DoTruncateCachedData() {
}
int HttpCache::Transaction::DoTruncateCachedDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedDataComplete"));
-
if (entry_) {
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_DATA,
@@ -1802,11 +1664,6 @@ int HttpCache::Transaction::DoTruncateCachedDataComplete(int result) {
}
int HttpCache::Transaction::DoTruncateCachedMetadata() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedMetadata"));
-
next_state_ = STATE_TRUNCATE_CACHED_METADATA_COMPLETE;
if (!entry_)
return OK;
@@ -1817,11 +1674,6 @@ int HttpCache::Transaction::DoTruncateCachedMetadata() {
}
int HttpCache::Transaction::DoTruncateCachedMetadataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedMetadataComplete"));
-
if (entry_) {
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_INFO,
@@ -1834,11 +1686,6 @@ int HttpCache::Transaction::DoTruncateCachedMetadataComplete(int result) {
}
int HttpCache::Transaction::DoPartialHeadersReceived() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoPartialHeadersReceived"));
-
new_response_ = NULL;
if (entry_ && !partial_.get() &&
entry_->disk_entry->GetDataSize(kMetadataIndex))
@@ -1862,11 +1709,6 @@ int HttpCache::Transaction::DoPartialHeadersReceived() {
}
int HttpCache::Transaction::DoCacheReadResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadResponse"));
-
DCHECK(entry_);
next_state_ = STATE_CACHE_READ_RESPONSE_COMPLETE;
@@ -1879,11 +1721,6 @@ int HttpCache::Transaction::DoCacheReadResponse() {
}
int HttpCache::Transaction::DoCacheReadResponseComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadResponseComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_READ_INFO, result);
if (result != io_buf_len_ ||
!HttpCache::ParseResponseInfo(read_buf_->data(), io_buf_len_,
@@ -1969,7 +1806,7 @@ int HttpCache::Transaction::DoCacheToggleUnusedSincePrefetchComplete(
}
int HttpCache::Transaction::DoCacheWriteResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"422516 HttpCache::Transaction::DoCacheWriteResponse"));
@@ -1982,11 +1819,6 @@ int HttpCache::Transaction::DoCacheWriteResponse() {
}
int HttpCache::Transaction::DoCacheWriteTruncatedResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteTruncatedResponse"));
-
if (entry_) {
if (net_log_.IsLogging())
net_log_.BeginEvent(NetLog::TYPE_HTTP_CACHE_WRITE_INFO);
@@ -1995,11 +1827,6 @@ int HttpCache::Transaction::DoCacheWriteTruncatedResponse() {
}
int HttpCache::Transaction::DoCacheWriteResponseComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteResponseComplete"));
-
next_state_ = target_state_;
target_state_ = STATE_NONE;
if (!entry_)
@@ -2018,11 +1845,6 @@ int HttpCache::Transaction::DoCacheWriteResponseComplete(int result) {
}
int HttpCache::Transaction::DoCacheReadMetadata() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadMetadata"));
-
DCHECK(entry_);
DCHECK(!response_.metadata.get());
next_state_ = STATE_CACHE_READ_METADATA_COMPLETE;
@@ -2038,11 +1860,6 @@ int HttpCache::Transaction::DoCacheReadMetadata() {
}
int HttpCache::Transaction::DoCacheReadMetadataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadMetadataComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_READ_INFO, result);
if (result != response_.metadata->size())
return OnCacheReadError(result, false);
@@ -2050,21 +1867,11 @@ int HttpCache::Transaction::DoCacheReadMetadataComplete(int result) {
}
int HttpCache::Transaction::DoCacheQueryData() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheQueryData"));
-
next_state_ = STATE_CACHE_QUERY_DATA_COMPLETE;
return entry_->disk_entry->ReadyForSparseIO(io_callback_);
}
int HttpCache::Transaction::DoCacheQueryDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheQueryDataComplete"));
-
DCHECK_EQ(OK, result);
if (!cache_.get())
return ERR_UNEXPECTED;
@@ -2073,11 +1880,6 @@ int HttpCache::Transaction::DoCacheQueryDataComplete(int result) {
}
int HttpCache::Transaction::DoCacheReadData() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadData"));
-
DCHECK(entry_);
next_state_ = STATE_CACHE_READ_DATA_COMPLETE;
@@ -2094,11 +1896,6 @@ int HttpCache::Transaction::DoCacheReadData() {
}
int HttpCache::Transaction::DoCacheReadDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadDataComplete"));
-
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_READ_DATA,
result);
@@ -2127,11 +1924,6 @@ int HttpCache::Transaction::DoCacheReadDataComplete(int result) {
}
int HttpCache::Transaction::DoCacheWriteData(int num_bytes) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteData"));
-
next_state_ = STATE_CACHE_WRITE_DATA_COMPLETE;
write_len_ = num_bytes;
if (entry_) {
@@ -2143,11 +1935,6 @@ int HttpCache::Transaction::DoCacheWriteData(int num_bytes) {
}
int HttpCache::Transaction::DoCacheWriteDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteDataComplete"));
-
if (entry_) {
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_DATA,
@@ -3248,10 +3035,6 @@ void HttpCache::Transaction::RecordHistograms() {
}
void HttpCache::Transaction::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 Transaction::OnIOComplete"));
-
DoLoop(result);
}
« no previous file with comments | « net/http/http_cache.cc ('k') | net/http/partial_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698