chrome: Use base's ContainsValue helper function instead of std::find

chrome/browser/android/thumbnail/thumbnail_cache.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/thumbnail/thumbnail_cache.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
 #include "base/android/path_utils.h"
 #include "base/big_endian.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/android_opengl/etc1/etc1.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
@@ skipping 171 matching lines @@
 Thumbnail* ThumbnailCache::Get(TabId tab_id,
                                bool force_disk_read,
                                bool allow_approximation) {
   Thumbnail* thumbnail = cache_.Get(tab_id);
   if (thumbnail) {
     thumbnail->CreateUIResource();
     return thumbnail;
   }
 
   if (force_disk_read &&
-      std::find(visible_ids_.begin(), visible_ids_.end(), tab_id) !=
-          visible_ids_.end() &&
-      std::find(read_queue_.begin(), read_queue_.end(), tab_id) ==
-          read_queue_.end()) {
+      ContainsValue(visible_ids_, tab_id) &&
+      !ContainsValue(read_queue_, tab_id)) {
     read_queue_.push_back(tab_id);
     ReadNextThumbnail();
   }
 
   if (allow_approximation) {
     thumbnail = approximation_cache_.Get(tab_id);
     if (thumbnail) {
       thumbnail->CreateUIResource();
       return thumbnail;
     }
@@ skipping 68 matching lines @@
   }
 
   read_queue_.clear();
   visible_ids_.clear();
   size_t count = 0;
   TabIdList::const_iterator iter = priority.begin();
   while (iter != priority.end() && count < ids_size) {
     TabId tab_id = *iter;
     visible_ids_.push_back(tab_id);
     if (!cache_.Get(tab_id) &&
-        std::find(read_queue_.begin(), read_queue_.end(), tab_id) ==
-            read_queue_.end()) {
+        !ContainsValue(read_queue_, tab_id))
       read_queue_.push_back(tab_id);
-    }
     iter++;
     count++;
   }
 
   ReadNextThumbnail();
 }
 
 void ThumbnailCache::DecompressThumbnailFromFile(
     TabId tab_id,
     const base::Callback<void(bool, SkBitmap)>&
@@ skipping 86 matching lines @@
           &ThumbnailCache::PostReadTask, weak_factory_.GetWeakPtr(), tab_id);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&ThumbnailCache::ReadTask, false, tab_id, post_read_task));
 }
 
 void ThumbnailCache::MakeSpaceForNewItemIfNecessary(TabId tab_id) {
   if (cache_.Get(tab_id) ||
-      std::find(visible_ids_.begin(), visible_ids_.end(), tab_id) ==
-          visible_ids_.end() ||
+      !ContainsValue(visible_ids_, tab_id) ||
       cache_.size() < cache_.MaximumCacheSize()) {
     return;
   }
 
   TabId key_to_remove;
   bool found_key_to_remove = false;
 
   // 1. Find a cached item not in this list
   for (ExpiringThumbnailCache::iterator iter = cache_.begin();
        iter != cache_.end();
        iter++) {
-    if (std::find(visible_ids_.begin(), visible_ids_.end(), iter->first) ==
-        visible_ids_.end()) {
+    if (!ContainsValue(visible_ids_, iter->first)) {
       key_to_remove = iter->first;
       found_key_to_remove = true;
       break;
     }
   }
 
   if (!found_key_to_remove) {
     // 2. Find the least important id we can remove.
     for (TabIdList::reverse_iterator riter = visible_ids_.rbegin();
          riter != visible_ids_.rend();
@@ skipping 473 matching lines @@
   dst_bitmap.eraseColor(0);
   SkAutoLockPixels dst_bitmap_lock(dst_bitmap);
 
   SkCanvas canvas(dst_bitmap);
   canvas.scale(new_scale, new_scale);
   canvas.drawBitmap(bitmap, 0, 0, NULL);
   dst_bitmap.setImmutable();
 
   return std::make_pair(dst_bitmap, new_scale * scale);
 }