Replace erase(std::remove_if()) in chrome/

This patch replaces the erase(std::remove_if()) used in the chrome
folder with base::EraseIf().

Bug: 875665
Change-Id: I8ebc80225ca4477dac2ae96f2e6dd21ef4602c52
Reviewed-on: https://chromium-review.googlesource.com/c/1469183Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Cr-Commit-Position: refs/heads/master@{#632004}

chrome/browser/history/history_tab_helper.cc

@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <utility>
 
+#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ -95,13 +96,9 @@ HistoryTabHelper::CreateHistoryAddPageArgs(
   // If this navigation attempted a Preview, remove those URLS from the redirect
   // chain so that they are not seen by the user. See http://crbug.com/914404.
   DCHECK(!add_page_args.redirects.empty());
-  add_page_args.redirects.erase(
-      std::remove_if(add_page_args.redirects.begin(),
-                     add_page_args.redirects.end(),
-                     [](const GURL& url) {
-                       return previews::IsLitePageRedirectPreviewURL(url);
-                     }),
-      add_page_args.redirects.end());
+  base::EraseIf(add_page_args.redirects, [](const GURL& url) {
+    return previews::IsLitePageRedirectPreviewURL(url);
+  });
   if (ui::PageTransitionIsMainFrame(navigation_handle->GetPageTransition()) &&
       virtual_url != navigation_handle->GetURL()) {
     // Hack on the "virtual" URL so that it will appear in history. For some

chrome/browser/policy/policy_browsertest.cc

@@ -4014,8 +4014,7 @@ class RestoreOnStartupPolicyTest
     // these tests.
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     base::CommandLine::StringVector argv = command_line->argv();
-    argv.erase(std::remove_if(++argv.begin(), argv.end(), IsNonSwitchArgument),
-               argv.end());
+    base::EraseIf(argv, IsNonSwitchArgument);
     command_line->InitFromArgv(argv);
     ASSERT_TRUE(std::equal(argv.begin(), argv.end(),
                            command_line->argv().begin()));

chrome/browser/sync_file_system/drive_backend/list_changes_task.cc

@@ -11,6 +11,7 @@
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/location.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
@@ -80,14 +81,10 @@ void ListChangesTask::DidListChanges(
   // google_apis::ChangeList can contain both FileResource and TeamDriveResource
   // entries. We only care about FileResource entries, so filter out any entries
   // that are TeamDriveReasource.
-  mutable_items->erase(
-      std::remove_if(
-          mutable_items->begin(), mutable_items->end(),
-          [](const auto& change_resource) {
-            return change_resource->type() ==
-                   google_apis::ChangeResource::ChangeType::TEAM_DRIVE;
-          }),
-      mutable_items->end());
+  base::EraseIf(*mutable_items, [](const auto& change_resource) {
+    return change_resource->type() ==
+           google_apis::ChangeResource::ChangeType::TEAM_DRIVE;
+  });
 
   change_list_.reserve(change_list_.size() + mutable_items->size());
 

chrome/browser/ui/app_list/arc/arc_app_test.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
@@ -235,12 +236,9 @@ void ArcAppTest::AddPackage(arc::mojom::ArcPackageInfoPtr package) {
 }
 
 void ArcAppTest::RemovePackage(const std::string& package_name) {
-  fake_packages_.erase(
-      std::remove_if(fake_packages_.begin(), fake_packages_.end(),
-                     [package_name](const auto& package) {
-                       return package->package_name == package_name;
-                     }),
-      fake_packages_.end());
+  base::EraseIf(fake_packages_, [package_name](const auto& package) {
+    return package->package_name == package_name;
+  });
 }
 
 bool ArcAppTest::FindPackage(const std::string& package_name) {

chrome/browser/ui/autofill/local_card_migration_dialog_controller_impl.cc

@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -210,13 +211,9 @@ void LocalCardMigrationDialogControllerImpl::DeleteCard(
   DCHECK(delete_local_card_callback_);
   delete_local_card_callback_.Run(deleted_card_guid);
 
-  migratable_credit_cards_.erase(
-      std::remove_if(migratable_credit_cards_.begin(),
-                     migratable_credit_cards_.end(),
-                     [&](const auto& card) {
-                       return card.credit_card().guid() == deleted_card_guid;
-                     }),
-      migratable_credit_cards_.end());
+  base::EraseIf(migratable_credit_cards_, [&](const auto& card) {
+    return card.credit_card().guid() == deleted_card_guid;
+  });
 
   if (!HasFailedCard()) {
     view_state_ = LocalCardMigrationDialogState::kFinished;