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

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

Issue 2228403003: content: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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
Index: content/browser/loader/resource_scheduler.cc
diff --git a/content/browser/loader/resource_scheduler.cc b/content/browser/loader/resource_scheduler.cc
index 12e7361fef6fdc0581b11ea97bcf6851cd5f0054..c8eaff46d9f7b7838b8457b54fc9993b7ce94d3b 100644
--- a/content/browser/loader/resource_scheduler.cc
+++ b/content/browser/loader/resource_scheduler.cc
@@ -136,7 +136,7 @@ class ResourceScheduler::RequestQueue {
// Returns true if |request| is queued.
bool IsQueued(ScheduledResourceRequest* request) const {
- return ContainsKey(pointers_, request);
+ return base::ContainsKey(pointers_, request);
}
// Returns true if no requests are queued.
@@ -302,7 +302,7 @@ bool ResourceScheduler::ScheduledResourceSorter::operator()(
void ResourceScheduler::RequestQueue::Insert(
ScheduledResourceRequest* request) {
- DCHECK(!ContainsKey(pointers_, request));
+ DCHECK(!base::ContainsKey(pointers_, request));
request->set_fifo_ordering(MakeFifoOrderingId());
pointers_[request] = queue_.insert(request);
}
@@ -334,7 +334,7 @@ class ResourceScheduler::Client {
void RemoveRequest(ScheduledResourceRequest* request) {
if (pending_requests_.IsQueued(request)) {
pending_requests_.Erase(request);
- DCHECK(!ContainsKey(in_flight_requests_, request));
+ DCHECK(!base::ContainsKey(in_flight_requests_, request));
} else {
EraseInFlightRequest(request);
@@ -398,7 +398,7 @@ class ResourceScheduler::Client {
request->set_request_priority_params(new_priority_params);
SetRequestAttributes(request, DetermineRequestAttributes(request));
if (!pending_requests_.IsQueued(request)) {
- DCHECK(ContainsKey(in_flight_requests_, request));
+ DCHECK(base::ContainsKey(in_flight_requests_, request));
// Request has already started.
return;
}
@@ -458,7 +458,7 @@ class ResourceScheduler::Client {
}
// Account for the current request if it is not in one of the lists yet.
if (current_request &&
- !ContainsKey(in_flight_requests_, current_request) &&
+ !base::ContainsKey(in_flight_requests_, current_request) &&
!current_request_is_pending) {
if (RequestAttributesAreSet(current_request->attributes(), attributes))
matching_request_count++;
@@ -504,7 +504,7 @@ class ResourceScheduler::Client {
ScheduledResourceRequest* request) {
RequestAttributes attributes = kAttributeNone;
- if (ContainsKey(in_flight_requests_, request))
+ if (base::ContainsKey(in_flight_requests_, request))
attributes |= kAttributeInFlight;
if (RequestAttributesAreSet(request->attributes(),
@@ -771,7 +771,7 @@ std::unique_ptr<ResourceThrottle> ResourceScheduler::ScheduleRequest(
void ResourceScheduler::RemoveRequest(ScheduledResourceRequest* request) {
DCHECK(CalledOnValidThread());
- if (ContainsKey(unowned_requests_, request)) {
+ if (base::ContainsKey(unowned_requests_, request)) {
unowned_requests_.erase(request);
return;
}
@@ -789,7 +789,7 @@ void ResourceScheduler::OnClientCreated(int child_id,
int route_id) {
DCHECK(CalledOnValidThread());
ClientId client_id = MakeClientId(child_id, route_id);
- DCHECK(!ContainsKey(client_map_, client_id));
+ DCHECK(!base::ContainsKey(client_map_, client_id));
Client* client = new Client(this);
client_map_[client_id] = client;
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/manifest/manifest_manager_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698