Use ContainsValue() instead of std::find() in chrome/chrome_cleaner

This simplifies many conditions around the code in
chrome/chrome_cleaner.

Bug: 561800
Change-Id: I4918b2ba3d6de0c4dac47e5e79c684a1b5430020
Reviewed-on: https://chromium-review.googlesource.com/1248522Reviewed-by: Joe Mason <joenotcharles@chromium.org>
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Cr-Commit-Position: refs/heads/master@{#594944}

chrome/chrome_cleaner/chrome_utils/extensions_util.cc

@@ -207,11 +207,8 @@ void GetDefaultExtensionsFromParsedJson(
 
   for (const auto& entry : *default_extensions) {
     base::string16 extension_id = base::UTF8ToUTF16(entry.first);
-    if (std::find(default_extension_whitelist.begin(),
-                  default_extension_whitelist.end(),
-                  extension_id) == default_extension_whitelist.end()) {
+    if (!base::ContainsValue(default_extension_whitelist, extension_id))
       policies->emplace_back(extension_id, extensions_file);
-    }
   }
 }
 

chrome/chrome_cleaner/scanner/urza_scanner_impl_unittest.cc

@@ -201,10 +201,8 @@ class ScannerTest : public testing::Test {
   void ExpectFoundPUPs(const std::set<UwSId>& pups) {
     EXPECT_EQ(pups.size(), found_pups_.size());
     std::set<UwSId>::const_iterator pup = pups.begin();
-    for (; pup != pups.end(); ++pup) {
-      EXPECT_NE(found_pups_.end(),
-                std::find(found_pups_.begin(), found_pups_.end(), *pup));
-    }
+    for (; pup != pups.end(); ++pup)
+      EXPECT_TRUE(base::ContainsValue(found_pups_, *pup));
     EXPECT_EQ(pups.size(), pups_seen_in_progress_callback_.size());
     EXPECT_EQ(pups, pups_seen_in_progress_callback_);
   }