[base] Remove base::Erase()/base::EraseIf() overloads for std::string

They're now replaced with C++20 std::erase()/std::erase_if(). Bug: 1414639 Change-Id: I89e190fb1f1d0e08ffccd34e242dcf812021f268 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5050051 Owners-Override: Kyle Charbonneau <kylechar@chromium.org> Reviewed-by: Kyle Charbonneau <kylechar@chromium.org> Commit-Queue: Andrew Rayskiy <greengrape@google.com> Cr-Commit-Position: refs/heads/main@{#1228504}
qweri0p · Nov 23, 2023 · 3b49263 · 3b49263
1 parent 9900d27
commit 3b49263
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 116 deletions.
diff --git a/base/BUILD.gn b/base/BUILD.gn
@@ -268,7 +268,6 @@ component("base") {
     "containers/cxx20_erase_internal.h",
     "containers/cxx20_erase_map.h",
     "containers/cxx20_erase_set.h",
-    "containers/cxx20_erase_string.h",
     "containers/cxx20_erase_vector.h",
     "containers/enum_set.h",
     "containers/extend.h",

diff --git a/base/containers/cxx20_erase.h b/base/containers/cxx20_erase.h
@@ -7,7 +7,6 @@
 
 #include "base/containers/cxx20_erase_map.h"
 #include "base/containers/cxx20_erase_set.h"
-#include "base/containers/cxx20_erase_string.h"
 #include "base/containers/cxx20_erase_vector.h"
 
 // Erase/EraseIf are based on C++20's uniform container erasure API:

diff --git a/base/containers/cxx20_erase_string.h b/base/containers/cxx20_erase_string.h
diff --git a/base/containers/erase_unittest.cc b/base/containers/erase_unittest.cc
@@ -74,43 +74,6 @@ struct HashByFirst {
 namespace base {
 namespace {
 
-TEST(Erase, String) {
-  const std::pair<std::string, std::string> test_data[] = {
-      {"", ""},
-      {"abc", "bc"},
-      {"abca", "bc"},
-  };
-
-  for (auto test_case : test_data) {
-    Erase(test_case.first, 'a');
-    EXPECT_EQ(test_case.second, test_case.first);
-  }
-
-  for (auto test_case : test_data) {
-    EraseIf(test_case.first, [](char elem) { return elem < 'b'; });
-    EXPECT_EQ(test_case.second, test_case.first);
-  }
-}
-
-TEST(Erase, String16) {
-  std::pair<std::u16string, std::u16string> test_data[] = {
-      {std::u16string(), std::u16string()},
-      {u"abc", u"bc"},
-      {u"abca", u"bc"},
-  };
-
-  const std::u16string letters = u"ab";
-  for (auto test_case : test_data) {
-    Erase(test_case.first, letters[0]);
-    EXPECT_EQ(test_case.second, test_case.first);
-  }
-
-  for (auto test_case : test_data) {
-    EraseIf(test_case.first, [&](short elem) { return elem < letters[1]; });
-    EXPECT_EQ(test_case.second, test_case.first);
-  }
-}
-
 TEST(Erase, Vector) {
   RunEraseTest<std::vector<int>>();
   RunEraseIfTest<std::vector<std::pair<int, int>>>();

diff --git a/cc/input/main_thread_scrolling_reason.cc b/cc/input/main_thread_scrolling_reason.cc
@@ -4,7 +4,8 @@
 
 #include "cc/input/main_thread_scrolling_reason.h"
 
-#include "base/containers/cxx20_erase.h"
+#include <string>
+
 #include "base/strings/string_util.h"
 #include "base/trace_event/traced_value.h"
 
@@ -19,7 +20,7 @@ std::string MainThreadScrollingReason::AsText(uint32_t reasons) {
   size_t array_end_pos = result.find(']');
   result =
       result.substr(array_start_pos + 1, array_end_pos - array_start_pos - 1);
-  base::Erase(result, '\"');
+  std::erase(result, '\"');
   // Add spaces after all commas.
   base::ReplaceChars(result, ",", ", ", &result);
   return result;

diff --git a/chrome/browser/headless/headless_mode_command_browsertest.cc b/chrome/browser/headless/headless_mode_command_browsertest.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ -213,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessModeDumpDomCommandBrowserTestWithTimeout,
 
   capture_stdout_.StopCapture();
   std::string captured_stdout = capture_stdout_.TakeCapturedData();
-  base::EraseIf(captured_stdout, isspace);
+  std::erase_if(captured_stdout, isspace);
 
   // Expect about:blank page DOM.
   EXPECT_THAT(captured_stdout,
@@ -290,7 +291,7 @@ IN_PROC_BROWSER_TEST_P(
 
   capture_stdout_.StopCapture();
   std::string captured_stdout = capture_stdout_.TakeCapturedData();
-  base::EraseIf(captured_stdout, isspace);
+  std::erase_if(captured_stdout, isspace);
 
   if (delay_response()) {
     EXPECT_THAT(result,

diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/pdf/pdf_extension_util.h"
 
-#include "base/containers/cxx20_erase.h"
+#include <string>
+
 #include "base/feature_list.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
@@ -171,7 +172,7 @@ void AddPdfViewerStrings(base::Value::Dict* dict) {
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   std::u16string edit_string = l10n_util::GetStringUTF16(IDS_EDIT);
-  base::Erase(edit_string, '&');
+  std::erase(edit_string, '&');
   dict->Set("editButton", edit_string);
 #endif
 

diff --git a/chrome/browser/ui/commander/simple_command_source.cc b/chrome/browser/ui/commander/simple_command_source.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/commander/simple_command_source.h"
 
+#include <string>
 #include <vector>
 
-#include "base/containers/cxx20_erase.h"
 #include "base/functional/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/no_destructor.h"
@@ -84,7 +84,7 @@ CommandSource::CommandResults SimpleCommandSource::GetCommands(
     if (!chrome::IsCommandEnabled(browser, command_spec.id))
       continue;
     std::u16string title = command_spec.title;
-    base::Erase(title, '&');
+    std::erase(title, '&');
     double score = finder.Find(title, &ranges);
     if (score == 0)
       continue;

diff --git a/chrome/browser/ui/commander/tab_command_source.cc b/chrome/browser/ui/commander/tab_command_source.cc
@@ -7,7 +7,6 @@
 #include <numeric>
 #include <string>
 
-#include "base/containers/cxx20_erase.h"
 #include "base/functional/bind.h"
 #include "base/ranges/algorithm.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -285,7 +284,7 @@ CommandSource::CommandResults MoveTabsToWindowCommandsForWindowsMatching(
   CommandSource::CommandResults results;
   // Add "New Window", if appropriate. It should score highest with no input.
   std::u16string new_window_title = l10n_util::GetStringUTF16(IDS_NEW_WINDOW);
-  base::Erase(new_window_title, '&');
+  std::erase(new_window_title, '&');
   std::unique_ptr<CommandItem> item;
   if (input.empty()) {
     item = std::make_unique<CommandItem>(new_window_title, .99,

diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
@@ -9,7 +9,6 @@
 #include <string>
 #include <utility>
 
-#include "base/containers/cxx20_erase.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ui_features.h"
 #include "chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.h"
@@ -40,7 +39,7 @@ void AddLocalizedString(content::WebUIDataSource* source,
                         const std::string& message,
                         int id) {
   std::u16string str = l10n_util::GetStringUTF16(id);
-  base::Erase(str, '&');
+  std::erase(str, '&');
   source->AddString(message, str);
 }
 

diff --git a/chrome/browser/ui/webui/webui_util.cc b/chrome/browser/ui/webui/webui_util.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/ui/webui/webui_util.h"
 
-#include "base/containers/cxx20_erase.h"
+#include <string>
+
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -82,7 +83,7 @@ void AddLocalizedString(content::WebUIDataSource* source,
                         const std::string& message,
                         int id) {
   std::u16string str = l10n_util::GetStringUTF16(id);
-  base::Erase(str, '&');
+  std::erase(str, '&');
   source->AddString(message, str);
 }
 

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -3082,7 +3082,10 @@ if (!is_android) {
           sources += [
             "../browser/devtools/protocol/devtools_printtopdf_browsertest.cc",
           ]
-          deps += [ "//components/printing/browser" ]
+          deps += [
+            "//components/printing/browser",
+            "//pdf",
+          ]
         }
       }
     }

diff --git a/chrome/updater/util/util.cc b/chrome/updater/util/util.cc
@@ -19,7 +19,6 @@
 #include "base/base_paths.h"
 #include "base/check_op.h"
 #include "base/command_line.h"
-#include "base/containers/cxx20_erase.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
@@ -302,7 +301,7 @@ GURL AppendQueryParameter(const GURL& url,
 
 std::wstring GetTaskNamePrefix(UpdaterScope scope) {
   std::wstring task_name = GetTaskDisplayName(scope);
-  base::EraseIf(task_name, base::IsAsciiWhitespace<wchar_t>);
+  std::erase_if(task_name, base::IsAsciiWhitespace<wchar_t>);
   return task_name;
 }
 

diff --git a/chrome/updater/util/win_util.cc b/chrome/updater/util/win_util.cc
@@ -25,7 +25,6 @@
 #include "base/check.h"
 #include "base/check_op.h"
 #include "base/command_line.h"
-#include "base/containers/cxx20_erase.h"
 #include "base/containers/flat_map.h"
 #include "base/containers/flat_set.h"
 #include "base/debug/alias.h"
@@ -460,7 +459,7 @@ std::string GetUACState() {
 
 std::wstring GetServiceName(bool is_internal_service) {
   std::wstring service_name = GetServiceDisplayName(is_internal_service);
-  base::EraseIf(service_name, base::IsAsciiWhitespace<wchar_t>);
+  std::erase_if(service_name, base::IsAsciiWhitespace<wchar_t>);
   return service_name;
 }
 

diff --git a/components/gcm_driver/instance_id/instance_id_impl.cc b/components/gcm_driver/instance_id/instance_id_impl.cc
@@ -8,9 +8,9 @@
 
 #include <algorithm>
 #include <memory>
+#include <string>
 
 #include "base/base64.h"
-#include "base/containers/cxx20_erase.h"
 #include "base/functional/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ -249,7 +249,7 @@ void InstanceIDImpl::EnsureIDGenerated() {
       &id_);
   std::replace(id_.begin(), id_.end(), '+', '-');
   std::replace(id_.begin(), id_.end(), '/', '_');
-  base::Erase(id_, '=');
+  std::erase(id_, '=');
 
   creation_time_ = base::Time::Now();
 

diff --git a/components/translate/core/language_detection/chinese_script_classifier.cc b/components/translate/core/language_detection/chinese_script_classifier.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <memory>
 #include <string>
-#include "base/containers/cxx20_erase.h"
+
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "third_party/icu/source/common/unicode/uniset.h"
@@ -783,7 +783,7 @@ std::string ChineseScriptClassifier::Classify(const std::string& input) const {
   base::TruncateUTF8ToByteSize(input, 500, &input_subset);
 
   // Remove whitespace since transliterators may not preserve it.
-  base::EraseIf(input_subset, base::IsAsciiWhitespace<char>);
+  std::erase_if(input_subset, base::IsAsciiWhitespace<char>);
 
   // Convert the input to icu::UnicodeString so we can iterate over codepoints.
   icu::UnicodeString input_codepoints =

diff --git a/headless/test/headless_command_browsertest.cc b/headless/test/headless_command_browsertest.cc
@@ -3,11 +3,10 @@
 // found in the LICENSE file.
 
 #include <cmath>
+#include <optional>
 #include <string>
 
-#include <optional>
 #include "base/command_line.h"
-#include "base/containers/cxx20_erase.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ -355,7 +354,7 @@ IN_PROC_BROWSER_TEST_P(HeadlessDumpDomSubResourceTimeoutCommandBrowserTest,
   capture_stdout.StopCapture();
 
   std::string captured_stdout_data = capture_stdout.TakeCapturedData();
-  base::EraseIf(captured_stdout_data, isspace);
+  std::erase_if(captured_stdout_data, isspace);
 
   if (delay_response()) {
     EXPECT_THAT(result(),

diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "base/command_line.h"
-#include "base/containers/cxx20_erase.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
 #include "base/memory/ref_counted.h"
@@ -525,7 +524,7 @@ class MSEChangeTypeTest
       std::string s = base::StrCat({std::get<0>(info.param).filename, "_AND_",
                                     std::get<1>(info.param).filename});
       // Strip out invalid param name characters.
-      base::EraseIf(s, [](char c) {
+      std::erase_if(s, [](char c) {
         return !absl::ascii_isalnum(static_cast<unsigned char>(c)) && c != '_';
       });
       return s;

diff --git a/net/base/data_url.cc b/net/base/data_url.cc
@@ -6,10 +6,10 @@
 
 #include "net/base/data_url.h"
 
+#include <string>
 #include <string_view>
 
 #include "base/base64.h"
-#include "base/containers/cxx20_erase.h"
 #include "base/feature_list.h"
 #include "base/features.h"
 #include "base/ranges/algorithm.h"
@@ -153,7 +153,7 @@ bool DataURL::Parse(const GURL& url,
       if (!(mime_type_value.compare(0, 5, "text/") == 0 ||
             mime_type_value.find("xml") != std::string::npos)) {
         temp = std::string(raw_body);
-        base::EraseIf(temp, base::IsAsciiWhitespace<char>);
+        std::erase_if(temp, base::IsAsciiWhitespace<char>);
         raw_body = temp;
       }