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

Unified Diff: content/browser/loader/resource_scheduler.cc

Issue 2907283002: Replace deprecated base::NonThreadSafe in content/browser/loader in favor of SequenceChecker. (Closed)
Patch Set: Created 3 years, 7 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 | « content/browser/loader/resource_scheduler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_scheduler.cc
diff --git a/content/browser/loader/resource_scheduler.cc b/content/browser/loader/resource_scheduler.cc
index 774f698c066db9ea37c4ba26caef154d2667ece8..2e1c500cc10cb84f07534a4aeaf5fe4d72200197 100644
--- a/content/browser/loader/resource_scheduler.cc
+++ b/content/browser/loader/resource_scheduler.cc
@@ -894,6 +894,7 @@ ResourceScheduler::ResourceScheduler()
kMaxRequestsBeforeYieldingDefault)) {}
ResourceScheduler::~ResourceScheduler() {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK(unowned_requests_.empty());
DCHECK(client_map_.empty());
}
@@ -903,7 +904,7 @@ std::unique_ptr<ResourceThrottle> ResourceScheduler::ScheduleRequest(
int route_id,
bool is_async,
net::URLRequest* url_request) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ClientId client_id = MakeClientId(child_id, route_id);
std::unique_ptr<ScheduledResourceRequest> request(
new ScheduledResourceRequest(
@@ -927,7 +928,7 @@ std::unique_ptr<ResourceThrottle> ResourceScheduler::ScheduleRequest(
}
void ResourceScheduler::RemoveRequest(ScheduledResourceRequest* request) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (base::ContainsKey(unowned_requests_, request)) {
unowned_requests_.erase(request);
return;
@@ -944,7 +945,7 @@ void ResourceScheduler::RemoveRequest(ScheduledResourceRequest* request) {
void ResourceScheduler::OnClientCreated(int child_id,
int route_id) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ClientId client_id = MakeClientId(child_id, route_id);
DCHECK(!base::ContainsKey(client_map_, client_id));
@@ -955,7 +956,7 @@ void ResourceScheduler::OnClientCreated(int child_id,
}
void ResourceScheduler::OnClientDeleted(int child_id, int route_id) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ClientId client_id = MakeClientId(child_id, route_id);
ClientMap::iterator it = client_map_.find(client_id);
DCHECK(it != client_map_.end());
@@ -983,7 +984,7 @@ void ResourceScheduler::OnLoadingStateChanged(int child_id,
}
void ResourceScheduler::OnNavigate(int child_id, int route_id) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ClientId client_id = MakeClientId(child_id, route_id);
ClientMap::iterator it = client_map_.find(client_id);
@@ -997,7 +998,7 @@ void ResourceScheduler::OnNavigate(int child_id, int route_id) {
}
void ResourceScheduler::OnWillInsertBody(int child_id, int route_id) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ClientId client_id = MakeClientId(child_id, route_id);
ClientMap::iterator it = client_map_.find(client_id);
@@ -1013,7 +1014,7 @@ void ResourceScheduler::OnWillInsertBody(int child_id, int route_id) {
void ResourceScheduler::OnReceivedSpdyProxiedHttpResponse(
int child_id,
int route_id) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ClientId client_id = MakeClientId(child_id, route_id);
ClientMap::iterator client_it = client_map_.find(client_id);
« no previous file with comments | « content/browser/loader/resource_scheduler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698