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

Unified Diff: net/url_request/url_fetcher_core.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/udp/udp_socket_win.cc ('k') | net/url_request/url_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_fetcher_core.cc
diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc
index 400791283a2fbc64c6a9bab51a667a7e79261214..23857ad057427b2f5efc2282090c14ba53ed14c8 100644
--- a/net/url_request/url_fetcher_core.cc
+++ b/net/url_request/url_fetcher_core.cc
@@ -541,6 +541,10 @@ URLFetcherCore::~URLFetcherCore() {
}
void URLFetcherCore::StartOnIOThread() {
+ // TODO(pkasting): Remove ScopedTracker below once crbug.com/456327 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "456327 URLFetcherCore::StartOnIOThread"));
DCHECK(network_task_runner_->BelongsToCurrentThread());
if (!response_writer_)
@@ -553,6 +557,10 @@ void URLFetcherCore::StartOnIOThread() {
}
void URLFetcherCore::StartURLRequest() {
+ // TODO(pkasting): Remove ScopedTracker below once crbug.com/456327 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "456327 URLFetcherCore::StartURLRequest"));
DCHECK(network_task_runner_->BelongsToCurrentThread());
if (was_cancelled_) {
@@ -669,8 +677,13 @@ void URLFetcherCore::StartURLRequestWhenAppropriate() {
DCHECK(request_context_getter_.get());
- int64 delay = INT64_C(0);
+ int64 delay = 0;
if (!original_url_throttler_entry_.get()) {
+ // TODO(pkasting): Remove ScopedTracker below once crbug.com/456327 is
+ // fixed.
+ tracked_objects::ScopedTracker tracking_profile1(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "456327 URLFetcherCore::StartURLRequestWhenAppropriate1"));
URLRequestThrottlerManager* manager =
request_context_getter_->GetURLRequestContext()->throttler_manager();
if (manager) {
@@ -679,11 +692,16 @@ void URLFetcherCore::StartURLRequestWhenAppropriate() {
}
}
if (original_url_throttler_entry_.get()) {
+ // TODO(pkasting): Remove ScopedTracker below once crbug.com/456327 is
+ // fixed.
+ tracked_objects::ScopedTracker tracking_profile2(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "456327 URLFetcherCore::StartURLRequestWhenAppropriate2"));
delay = original_url_throttler_entry_->ReserveSendingTimeForNextRequest(
GetBackoffReleaseTime());
}
- if (delay == INT64_C(0)) {
+ if (delay == 0) {
StartURLRequest();
} else {
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
« no previous file with comments | « net/udp/udp_socket_win.cc ('k') | net/url_request/url_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698