Change std::find() to use base:: functions: ios/

Simplifies code slightly. Bug: 1368812 Change-Id: Iba6a19bbd58dfcf3c02bbde52847faf344e33ea5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3928181 Reviewed-by: Sylvain Defresne <sdefresne@chromium.org> Reviewed-by: Rohit Rao <rohitrao@chromium.org> Auto-Submit: Peter Kasting <pkasting@chromium.org> Commit-Queue: Sylvain Defresne <sdefresne@chromium.org> Commit-Queue: Rohit Rao <rohitrao@chromium.org> Cr-Commit-Position: refs/heads/main@{#1054133}
marcosholgado · Oct 3, 2022 · 741897c · 741897c
1 parent d2408c2
commit 741897c
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 39 deletions.
diff --git a/ios/chrome/browser/browser_state/browser_state_info_cache.cc b/ios/chrome/browser/browser_state/browser_state_info_cache.cc
@@ -6,14 +6,14 @@
 
 #include <stddef.h>
 
-#include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/check_op.h"
 #include "base/i18n/case_conversion.h"
 #include "base/memory/ptr_util.h"
 #include "base/notreached.h"
+#include "base/ranges/algorithm.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/prefs/pref_registry_simple.h"
@@ -81,7 +81,7 @@ void BrowserStateInfoCache::RemoveBrowserState(
   base::Value* cache = update.Get();
   std::string key = CacheKeyFromBrowserStatePath(browser_state_path);
   cache->RemoveKey(key);
-  sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key));
+  sorted_keys_.erase(base::ranges::find(sorted_keys_, key));
 
   for (auto& observer : observer_list_)
     observer.OnBrowserStateWasRemoved(browser_state_path);

diff --git a/ios/chrome/browser/infobars/infobar_badge_tab_helper.mm b/ios/chrome/browser/infobars/infobar_badge_tab_helper.mm
@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/infobars/infobar_badge_tab_helper.h"
 
+#import "base/ranges/algorithm.h"
 #import "ios/chrome/browser/infobars/infobar_badge_tab_helper_delegate.h"
 #import "ios/chrome/browser/infobars/infobar_manager_impl.h"
 
@@ -101,8 +102,7 @@ InfobarType GetInfobarType(infobars::InfoBar* infobar) {
 void InfobarBadgeTabHelper::UnregisterInfobar(infobars::InfoBar* infobar) {
   // Handling the case where an infobar is removed during prerendering.
   if (!delegate_) {
-    auto pos = std::find(infobars_added_when_prerendering_.begin(),
-                         infobars_added_when_prerendering_.end(), infobar);
+    auto pos = base::ranges::find(infobars_added_when_prerendering_, infobar);
     if (pos != infobars_added_when_prerendering_.end())
       infobars_added_when_prerendering_.erase(pos);
     return;

diff --git a/ios/chrome/browser/promos_manager/promos_manager.mm b/ios/chrome/browser/promos_manager/promos_manager.mm
@@ -6,13 +6,13 @@
 
 #import <Foundation/Foundation.h>
 
-#import <algorithm>
 #import <iterator>
 #import <map>
 #import <numeric>
 #import <set>
 #import <vector>
 
+#import "base/containers/contains.h"
 #import "base/time/time.h"
 #import "base/values.h"
 #import "components/prefs/pref_service.h"
@@ -395,11 +395,10 @@ ScopedListPrefUpdate single_display_promos_update(
     // If the current impression's promo already exists in
     // `active_promos_sorted_by_least_recently_shown`, move onto the next
     // impression.
-    if (std::find(active_promos_sorted_by_least_recently_shown.begin(),
-                  active_promos_sorted_by_least_recently_shown.end(),
-                  impression.promo) !=
-        active_promos_sorted_by_least_recently_shown.end())
+    if (base::Contains(active_promos_sorted_by_least_recently_shown,
+                       impression.promo)) {
       continue;
+    }
 
     if (active_promos.count(impression.promo))
       active_promos_sorted_by_least_recently_shown.push_back(impression.promo);
@@ -413,11 +412,10 @@ ScopedListPrefUpdate single_display_promos_update(
   // Never-before-seen promos are considered less recently seen than previously
   // seen promos.
   for (promos_manager::Promo unseen_promo : active_promos) {
-    if (std::find(active_promos_sorted_by_least_recently_shown.begin(),
-                  active_promos_sorted_by_least_recently_shown.end(),
-                  unseen_promo) ==
-        active_promos_sorted_by_least_recently_shown.end())
+    if (!base::Contains(active_promos_sorted_by_least_recently_shown,
+                        unseen_promo)) {
       active_promos_sorted_by_least_recently_shown.push_back(unseen_promo);
+    }
   }
 
   std::reverse(active_promos_sorted_by_least_recently_shown.begin(),

diff --git a/ios/chrome/browser/search_engines/search_engine_tab_helper_unittest.mm b/ios/chrome/browser/search_engines/search_engine_tab_helper_unittest.mm
@@ -5,6 +5,7 @@
 #import "ios/chrome/browser/search_engines/search_engine_tab_helper.h"
 
 #import "base/bind.h"
+#import "base/containers/contains.h"
 #import "base/strings/utf_string_conversions.h"
 #import "base/test/ios/wait_util.h"
 #import "components/favicon/core/favicon_service.h"
@@ -141,7 +142,7 @@ void SetUp() override {
   // added and others remain untouched.
   TemplateURL* new_url = nullptr;
   for (TemplateURL* url : template_url_service()->GetTemplateURLs()) {
-    if (std::find(old_urls.begin(), old_urls.end(), url) == old_urls.end()) {
+    if (!base::Contains(old_urls, url)) {
       ASSERT_FALSE(new_url);
       new_url = url;
     }
@@ -191,7 +192,7 @@ GURL searchable_url(
   // added and others remain untouched.
   TemplateURL* new_url = nullptr;
   for (TemplateURL* url : template_url_service()->GetTemplateURLs()) {
-    if (std::find(old_urls.begin(), old_urls.end(), url) == old_urls.end()) {
+    if (!base::Contains(old_urls, url)) {
       ASSERT_FALSE(new_url);
       new_url = url;
     }

diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.mm b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.mm
@@ -6,6 +6,7 @@
 
 #import <stdint.h>
 
+#import <algorithm>
 #import <memory>
 #import <vector>
 
@@ -15,6 +16,7 @@
 #import "base/hash/hash.h"
 #import "base/i18n/string_compare.h"
 #import "base/metrics/user_metrics_action.h"
+#import "base/ranges/algorithm.h"
 #import "base/strings/string_number_conversions.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/strings/utf_string_conversions.h"
@@ -412,7 +414,7 @@ void UpdateFoldersFromNode(const BookmarkNode* folder,
 
   bookmark_utils_ios::SortFolders(&directDescendants);
 
-  auto it = std::find(results->begin(), results->end(), folder);
+  auto it = base::ranges::find(*results, folder);
   DCHECK(it != results->end());
   ++it;
   results->insert(it, directDescendants.begin(), directDescendants.end());

diff --git a/...rowser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.mm b/...rowser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.mm
@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/destination_usage_history.h"
 
+#import "base/ranges/algorithm.h"
 #import "base/strings/string_number_conversions.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/time/time.h"
@@ -124,8 +125,8 @@ int NumClicks(overflow_menu::Destination destination,
 void Swap(std::vector<overflow_menu::Destination>& ranking,
           overflow_menu::Destination from,
           overflow_menu::Destination to) {
-  auto from_loc = std::find(ranking.begin(), ranking.end(), from);
-  auto to_loc = std::find(ranking.begin(), ranking.end(), to);
+  auto from_loc = base::ranges::find(ranking, from);
+  auto to_loc = base::ranges::find(ranking, to);
   *from_loc = to;
   *to_loc = from;
 }

diff --git a/ios/chrome/browser/ui/settings/language/language_settings_mediator.mm b/ios/chrome/browser/ui/settings/language/language_settings_mediator.mm
@@ -7,6 +7,7 @@
 #import <memory>
 
 #import "base/check.h"
+#import "base/containers/contains.h"
 #import "base/mac/foundation_util.h"
 #import "base/metrics/histogram_macros.h"
 #import "base/notreached.h"
@@ -192,8 +193,7 @@ - (void)onPreferenceChanged:(const std::string&)preferenceName {
       [NSMutableArray arrayWithCapacity:languages.size()];
   for (const auto& language : languages) {
     // Ignore languages already in the accept languages list.
-    if (std::find(acceptLanguageCodes.begin(), acceptLanguageCodes.end(),
-                  language.code) != acceptLanguageCodes.end()) {
+    if (base::Contains(acceptLanguageCodes, language.code)) {
       continue;
     }
     LanguageItem* languageItem = [self languageItemFromLanguage:language];

diff --git a/ios/chrome/browser/ui/settings/language/language_settings_mediator_unittest.mm b/ios/chrome/browser/ui/settings/language/language_settings_mediator_unittest.mm
@@ -6,6 +6,7 @@
 #import <string>
 #import <vector>
 
+#import "base/containers/contains.h"
 #import "base/strings/sys_string_conversions.h"
 #import "base/test/ios/wait_util.h"
 #import "base/test/task_environment.h"
@@ -193,14 +194,12 @@ - (void)languagePrefsChanged {
 
   std::vector<std::string> language_codes =
       ExtractLanguageCodesFromLanguageItems(language_items);
-  EXPECT_TRUE(std::find(language_codes.begin(), language_codes.end(), "fa") !=
-              language_codes.end());
+  EXPECT_TRUE(base::Contains(language_codes, "fa"));
 
   translate_prefs()->AddToLanguageList("fa", /*force_blocked=*/false);
   language_items = [mediator() supportedLanguagesItems];
   language_codes = ExtractLanguageCodesFromLanguageItems(language_items);
-  EXPECT_FALSE(std::find(language_codes.begin(), language_codes.end(), "fa") !=
-               language_codes.end());
+  EXPECT_FALSE(base::Contains(language_codes, "fa"));
 }
 
 // Tests that the list of accept language items is as expected.

diff --git a/ios/chrome/browser/ui/settings/password/password_details/password_details_mediator.mm b/ios/chrome/browser/ui/settings/password/password_details/password_details_mediator.mm
@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/ui/settings/password/password_details/password_details_mediator.h"
 
+#import "base/containers/contains.h"
 #import "base/strings/sys_string_conversions.h"
 #import "components/password_manager/core/browser/ui/credential_ui_entry.h"
 #import "ios/chrome/browser/passwords/password_check_observer_bridge.h"
@@ -143,8 +144,7 @@ - (void)fetchPasswordWith:
     (const std::vector<password_manager::CredentialUIEntry>&)credentials {
   PasswordDetails* password =
       [[PasswordDetails alloc] initWithCredential:_credential];
-  password.compromised = std::find(credentials.begin(), credentials.end(),
-                                   _credential) != credentials.end();
+  password.compromised = base::Contains(credentials, _credential);
   [self.consumer setPassword:password];
 }
 

diff --git a/ios/chrome/browser/ui/settings/password/password_manager_view_controller.mm b/ios/chrome/browser/ui/settings/password/password_manager_view_controller.mm
@@ -10,6 +10,7 @@
 #import "base/mac/foundation_util.h"
 #import "base/metrics/histogram_functions.h"
 #import "base/metrics/user_metrics.h"
+#import "base/ranges/algorithm.h"
 #import "base/strings/sys_string_conversions.h"
 #import "components/google/core/common/google_util.h"
 #import "components/keyed_service/core/service_access_type.h"
@@ -1818,12 +1819,11 @@ - (void)deleteItemAtIndexPaths:(NSArray<NSIndexPath*>*)indexPaths {
     auto removeCredential =
         [](std::vector<password_manager::CredentialUIEntry>& credentials,
            const password_manager::CredentialUIEntry& credential) {
-          auto iterator =
-              std::find(credentials.begin(), credentials.end(), credential);
+          auto iterator = base::ranges::find(credentials, credential);
           if (iterator != credentials.end())
             credentials.erase(iterator);
         };
-    
+
     if (itemType == ItemTypeBlocked) {
       removeCredential(_blockedSites, credential);
     } else {

diff --git a/ios/chrome/browser/web_state_list/active_web_state_observation_forwarder_unittest.mm b/ios/chrome/browser/web_state_list/active_web_state_observation_forwarder_unittest.mm
@@ -4,10 +4,10 @@
 
 #import "ios/chrome/browser/web_state_list/active_web_state_observation_forwarder.h"
 
-#import <algorithm>
 #import <memory>
 #import <vector>
 
+#import "base/containers/contains.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_delegate.h"
 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
@@ -29,8 +29,7 @@
   ~TestObserver() override {}
 
   bool WasInvokedFor(web::WebState* web_state) {
-    return std::find(invoker_web_states_.begin(), invoker_web_states_.end(),
-                     web_state) != invoker_web_states_.end();
+    return base::Contains(invoker_web_states_, web_state);
   }
 
   void Reset() { invoker_web_states_.clear(); }

diff --git a/ios/chrome/browser/web_state_list/all_web_state_observation_forwarder_unittest.mm b/ios/chrome/browser/web_state_list/all_web_state_observation_forwarder_unittest.mm
@@ -4,10 +4,10 @@
 
 #import "ios/chrome/browser/web_state_list/all_web_state_observation_forwarder.h"
 
-#import <algorithm>
 #import <memory>
 #import <vector>
 
+#import "base/containers/contains.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_delegate.h"
 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
@@ -29,8 +29,7 @@
   ~TestObserver() override {}
 
   bool WasInvokedFor(web::WebState* web_state) {
-    return std::find(invoker_web_states_.begin(), invoker_web_states_.end(),
-                     web_state) != invoker_web_states_.end();
+    return base::Contains(invoker_web_states_, web_state);
   }
 
   void Reset() { invoker_web_states_.clear(); }

diff --git a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
@@ -5,6 +5,7 @@
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.h"
 
 #import "base/command_line.h"
+#import "base/containers/contains.h"
 #import "base/files/file_util.h"
 #import "base/ios/ios_util.h"
 #import "base/json/json_string_value_serializer.h"
@@ -1027,7 +1028,7 @@ + (BOOL)isVariationEnabled:(int)variationID {
   std::vector<variations::VariationID> ids = provider->GetVariationsVector(
       {variations::GOOGLE_WEB_PROPERTIES_ANY_CONTEXT,
        variations::GOOGLE_WEB_PROPERTIES_FIRST_PARTY});
-  return std::find(ids.begin(), ids.end(), variationID) != ids.end();
+  return base::Contains(ids, variationID);
 }
 
 + (BOOL)isTriggerVariationEnabled:(int)variationID {
@@ -1036,7 +1037,7 @@ + (BOOL)isTriggerVariationEnabled:(int)variationID {
   std::vector<variations::VariationID> ids = provider->GetVariationsVector(
       {variations::GOOGLE_WEB_PROPERTIES_TRIGGER_ANY_CONTEXT,
        variations::GOOGLE_WEB_PROPERTIES_TRIGGER_FIRST_PARTY});
-  return std::find(ids.begin(), ids.end(), variationID) != ids.end();
+  return base::Contains(ids, variationID);
 }
 
 + (BOOL)isUKMEnabled {

diff --git a/ios/web/js_messaging/web_frame_web_state_observer_inttest.mm b/ios/web/js_messaging/web_frame_web_state_observer_inttest.mm
@@ -4,6 +4,7 @@
 
 #import "ios/web/public/test/web_test_with_web_state.h"
 
+#import "base/containers/contains.h"
 #import "base/ios/ios_util.h"
 #import "ios/testing/embedded_test_server_handlers.h"
 #import "ios/web/public/js_messaging/web_frame.h"
@@ -56,7 +57,7 @@ bool IsMainFrame(web::WebFrame* frame) {
 
   web::WebFramesManager* manager = web_state->GetWebFramesManager();
   auto frames = manager->GetAllWebFrames();
-  EXPECT_TRUE(frames.end() != std::find(frames.begin(), frames.end(), arg1));
+  EXPECT_TRUE(base::Contains(frames, arg1));
   EXPECT_NE(manager->GetMainWebFrame(), arg1);
 }
 }

diff --git a/ios/web/webui/web_ui_ios_controller_factory_registry.mm b/ios/web/webui/web_ui_ios_controller_factory_registry.mm
@@ -5,9 +5,11 @@
 #import "ios/web/webui/web_ui_ios_controller_factory_registry.h"
 
 #import <stddef.h>
+
 #import <memory>
 
 #import "base/no_destructor.h"
+#import "base/ranges/algorithm.h"
 #import "ios/web/public/webui/web_ui_ios_controller.h"
 #import "url/gurl.h"
 #import "url/url_constants.h"
@@ -33,7 +35,7 @@
 void WebUIIOSControllerFactory::DeregisterFactory(
     WebUIIOSControllerFactory* factory) {
   std::vector<WebUIIOSControllerFactory*>& factories = GetGlobalFactories();
-  auto position = std::find(factories.begin(), factories.end(), factory);
+  auto position = base::ranges::find(factories, factory);
   if (position != factories.end())
     factories.erase(position);
 }