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

chrome/browser/signin/oauth2_token_service_delegate_android.cc

 // Copyright 2013 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/signin/oauth2_token_service_delegate_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/stl_util.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_android.h"
 #include "components/signin/core/browser/account_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/oauth2_access_token_fetcher.h"
 #include "jni/OAuth2TokenService_jni.h"
 
 using base::android::AttachCurrentThread;
@@ skipping 330 matching lines @@
     fire_refresh_token_loaded_ = RT_LOADED;
     FireRefreshTokensLoaded();
   } else if (fire_refresh_token_loaded_ == RT_LOAD_NOT_START) {
     fire_refresh_token_loaded_ = RT_HAS_BEEN_VALIDATED;
   }
 
   // Clear accounts no longer exist on device from AccountTrackerService.
   std::vector<AccountInfo> accounts_info =
       account_tracker_service_->GetAccounts();
   for (const AccountInfo& info : accounts_info) {
-    if (std::find(curr_ids.begin(), curr_ids.end(), info.account_id) ==
-        curr_ids.end())
+    if (!ContainsValue(curr_ids, info.account_id))
       account_tracker_service_->RemoveAccount(info.account_id);
   }
 
   // No need to wait for SigninManager to finish migration if not signed in.
   if (account_tracker_service_->GetMigrationState() ==
           AccountTrackerService::MIGRATION_IN_PROGRESS &&
       signed_in_account_id.empty()) {
     account_tracker_service_->SetMigrationDone();
   }
 }
 
 bool OAuth2TokenServiceDelegateAndroid::ValidateAccounts(
     const std::string& signed_in_id,
     const std::vector<std::string>& prev_ids,
     const std::vector<std::string>& curr_ids,
     std::vector<std::string>* refreshed_ids,
     std::vector<std::string>* revoked_ids,
     bool force_notifications) {
-  bool currently_signed_in = std::find(curr_ids.begin(), curr_ids.end(),
-                                       signed_in_id) != curr_ids.end();
+  bool currently_signed_in = ContainsValue(curr_ids, signed_in_id);
   if (currently_signed_in) {
     // Revoke token for ids that have been removed from the device.
     for (const std::string& prev_id : prev_ids) {
       if (prev_id == signed_in_id)
         continue;
-      if (std::find(curr_ids.begin(), curr_ids.end(), prev_id) ==
-          curr_ids.end()) {
+      if (!ContainsValue(curr_ids, prev_id)) {
         DVLOG(1) << "OAuth2TokenServiceDelegateAndroid::ValidateAccounts:"
                  << "revoked=" << prev_id;
         revoked_ids->push_back(prev_id);
       }
     }
 
     // Refresh token for new ids or all ids if |force_notifications|.
     if (force_notifications ||
-        std::find(prev_ids.begin(), prev_ids.end(), signed_in_id) ==
-            prev_ids.end()) {
+        !ContainsValue(prev_ids, signed_in_id)) {
       // Always fire the primary signed in account first.
       DVLOG(1) << "OAuth2TokenServiceDelegateAndroid::ValidateAccounts:"
                << "refreshed=" << signed_in_id;
       refreshed_ids->push_back(signed_in_id);
     }
     for (const std::string& curr_id : curr_ids) {
       if (curr_id == signed_in_id)
         continue;
       if (force_notifications ||
-          std::find(prev_ids.begin(), prev_ids.end(), curr_id) ==
-              prev_ids.end()) {
+          !ContainsValue(prev_ids, curr_id)) {
         DVLOG(1) << "OAuth2TokenServiceDelegateAndroid::ValidateAccounts:"
                  << "refreshed=" << curr_id;
         refreshed_ids->push_back(curr_id);
       }
     }
   } else {
-    if (std::find(prev_ids.begin(), prev_ids.end(), signed_in_id) !=
-        prev_ids.end()) {
+    if (ContainsValue(prev_ids, signed_in_id)) {
       DVLOG(1) << "OAuth2TokenServiceDelegateAndroid::ValidateAccounts:"
                << "revoked=" << signed_in_id;
       revoked_ids->push_back(signed_in_id);
     }
     for (const std::string& prev_id : prev_ids) {
       if (prev_id == signed_in_id)
         continue;
       DVLOG(1) << "OAuth2TokenServiceDelegateAndroid::ValidateAccounts:"
                << "revoked=" << prev_id;
       revoked_ids->push_back(prev_id);
@@ skipping 135 matching lines @@
               : isTransientError
                     ? GoogleServiceAuthError::CONNECTION_FAILED
                     : GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
   heap_callback->Run(err, token, base::Time());
 }
 
 // static
 bool OAuth2TokenServiceDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }