Index: chrome/browser/android/thumbnail/thumbnail_cache.cc |
diff --git a/chrome/browser/android/thumbnail/thumbnail_cache.cc b/chrome/browser/android/thumbnail/thumbnail_cache.cc |
index 295d7fbf9e731628b8f8acff7b811be57c866759..307bbe382983e3f57b8e360b8947001577c54a96 100644 |
--- a/chrome/browser/android/thumbnail/thumbnail_cache.cc |
+++ b/chrome/browser/android/thumbnail/thumbnail_cache.cc |
@@ -205,9 +205,8 @@ Thumbnail* ThumbnailCache::Get(TabId tab_id, |
return thumbnail; |
} |
- if (force_disk_read && |
- ContainsValue(visible_ids_, tab_id) && |
- !ContainsValue(read_queue_, tab_id)) { |
+ if (force_disk_read && base::ContainsValue(visible_ids_, tab_id) && |
+ !base::ContainsValue(read_queue_, tab_id)) { |
read_queue_.push_back(tab_id); |
ReadNextThumbnail(); |
} |
@@ -295,8 +294,7 @@ void ThumbnailCache::UpdateVisibleIds(const TabIdList& priority) { |
while (iter != priority.end() && count < ids_size) { |
TabId tab_id = *iter; |
visible_ids_.push_back(tab_id); |
- if (!cache_.Get(tab_id) && |
- !ContainsValue(read_queue_, tab_id)) |
+ if (!cache_.Get(tab_id) && !base::ContainsValue(read_queue_, tab_id)) |
read_queue_.push_back(tab_id); |
iter++; |
count++; |
@@ -403,8 +401,7 @@ void ThumbnailCache::ReadNextThumbnail() { |
} |
void ThumbnailCache::MakeSpaceForNewItemIfNecessary(TabId tab_id) { |
- if (cache_.Get(tab_id) || |
- !ContainsValue(visible_ids_, tab_id) || |
+ if (cache_.Get(tab_id) || !base::ContainsValue(visible_ids_, tab_id) || |
cache_.size() < cache_.MaximumCacheSize()) { |
return; |
} |
@@ -416,7 +413,7 @@ void ThumbnailCache::MakeSpaceForNewItemIfNecessary(TabId tab_id) { |
for (ExpiringThumbnailCache::iterator iter = cache_.begin(); |
iter != cache_.end(); |
iter++) { |
- if (!ContainsValue(visible_ids_, iter->first)) { |
+ if (!base::ContainsValue(visible_ids_, iter->first)) { |
key_to_remove = iter->first; |
found_key_to_remove = true; |
break; |