Use ContainsValue() instead of std::find() at components -2-

replace std::find() with base::containsValue()
at components/safe_browsing and components/search_engine
and components/signin

Bug: 561800
Change-Id: I0b100cd3e058cdf506cc59a6cf5ee4b6ee844c1a
Reviewed-on: https://chromium-review.googlesource.com/1107429Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Hwanseung Lee <hs1217.lee@samsung.com>
Cr-Commit-Position: refs/heads/master@{#569068}

components/safe_browsing/browser/threat_details.cc

@@ -15,6 +15,7 @@
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/safe_browsing/base_ui_manager.h"
@@ -252,8 +253,7 @@ void TrimElements(const std::set<int> target_ids,
     const HTMLElement& element = *element_iter->second;
 
     // Delete any elements that we do not want to keep.
-    if (std::find(ids_to_keep.begin(), ids_to_keep.end(), element.id()) ==
-        ids_to_keep.end()) {
+    if (!base::ContainsValue(ids_to_keep, element.id())) {
       if (element.has_resource_id()) {
         const std::string& resource_url =
             resource_id_to_url[element.resource_id()];

components/safe_browsing/db/v4_get_hash_protocol_manager.cc

@@ -531,8 +531,7 @@ void V4GetHashProtocolManager::OnFullHashForApi(
   ThreatMetadata md;
   for (const FullHashInfo& full_hash_info : full_hash_infos) {
     DCHECK_EQ(GetChromeUrlApiId(), full_hash_info.list_id);
-    DCHECK(std::find(full_hashes.begin(), full_hashes.end(),
-                     full_hash_info.full_hash) != full_hashes.end());
+    DCHECK(base::ContainsValue(full_hashes, full_hash_info.full_hash));
     md.api_permissions.insert(full_hash_info.metadata.api_permissions.begin(),
                               full_hash_info.metadata.api_permissions.end());
   }

components/safe_browsing/password_protection/password_protection_service.cc

@@ -15,6 +15,7 @@
 #include "base/metrics/field_trial.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/metrics/histogram_functions.h"
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ -782,8 +783,7 @@ bool PasswordProtectionService::ParseVerdictEntry(
 bool PasswordProtectionService::PathVariantsMatchCacheExpression(
     const std::vector<std::string>& generated_paths,
     const std::string& cache_expression_path) {
-  return std::find(generated_paths.begin(), generated_paths.end(),
-                   cache_expression_path) != generated_paths.end();
+  return base::ContainsValue(generated_paths, cache_expression_path);
 }
 
 bool PasswordProtectionService::IsCacheExpired(int cache_creation_time,

components/search_engines/template_url.cc

@@ -15,6 +15,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
@@ -1441,7 +1442,7 @@ void TemplateURL::EncodeSearchTerms(
     base::string16* encoded_original_query) const {
 
   std::vector<std::string> encodings(input_encodings());
-  if (std::find(encodings.begin(), encodings.end(), "UTF-8") == encodings.end())
+  if (!base::ContainsValue(encodings, "UTF-8"))
     encodings.push_back("UTF-8");
   for (auto i = encodings.begin(); i != encodings.end(); ++i) {
     if (TryEncoding(search_terms_args.search_terms,

components/signin/core/browser/account_reconcilor.cc

@@ -15,6 +15,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "components/signin/core/browser/account_reconcilor_delegate.h"
@@ -471,8 +472,7 @@ void AccountReconcilor::FinishReconcile(
       chrome_accounts, gaia_accounts, primary_account, first_execution_);
   // |first_account| must be in |chrome_accounts|.
   DCHECK(first_account.empty() ||
-         (std::find(chrome_accounts.begin(), chrome_accounts.end(),
-                    first_account) != chrome_accounts.end()));
+         base::ContainsValue(chrome_accounts, first_account));
   size_t number_gaia_accounts = gaia_accounts.size();
   bool first_account_mismatch =
       (number_gaia_accounts > 0) && (first_account != gaia_accounts[0].id);
@@ -483,9 +483,7 @@ void AccountReconcilor::FinishReconcile(
   int removed_from_cookie = 0;
   for (size_t i = 0; i < number_gaia_accounts; ++i) {
     if (gaia_accounts[i].valid &&
-        chrome_accounts.end() == std::find(chrome_accounts.begin(),
-                                           chrome_accounts.end(),
-                                           gaia_accounts[i].id)) {
+        !base::ContainsValue(chrome_accounts, gaia_accounts[i].id)) {
       ++removed_from_cookie;
     }
   }

components/signin/core/browser/child_account_info_fetcher_impl.cc

@@ -4,6 +4,7 @@
 
 #include "components/signin/core/browser/child_account_info_fetcher_impl.h"
 
+#include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
@@ -127,10 +128,8 @@ void ChildAccountInfoFetcherImpl::OnGetUserInfoSuccess(
     std::vector<std::string> service_flags = base::SplitString(
         services_iter->second, ",", base::TRIM_WHITESPACE,
         base::SPLIT_WANT_ALL);
-    bool is_child_account =
-        std::find(service_flags.begin(), service_flags.end(),
-                  AccountTrackerService::kChildAccountServiceFlag) !=
-        service_flags.end();
+    bool is_child_account = base::ContainsValue(
+        service_flags, AccountTrackerService::kChildAccountServiceFlag);
     if (!is_child_account && invalidation_service_) {
       // Don't bother listening for invalidations as a non-child account can't
       // become a child account.