Use base::Erase(), base::EraseIf() in components/

This patch is just a code simplification.

It's much easier to write:
  base::Erase(container, value);
  base::EraseIf(container, ...);
than:
  container.erase(std::remove(container.begin(),
      container.end(), value), container.end());
  container.erase(std::remove_if(container.begin(),
      container.end(), ...), container.end());

Bug: 875665
Change-Id: I4eb9f77b58befd58c6c978eb7ce591b5d95bd613
Reviewed-on: https://chromium-review.googlesource.com/1181483
Reviewed-by: Jinho Bang <jinho.bang@samsung.com>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Jinho Bang <jinho.bang@samsung.com>
Cr-Commit-Position: refs/heads/master@{#585811}
NOKEYCHECK=True
GitOrigin-RevId: a248d5c3e929268bae58e3f5b1a39371a2a6c5f8

1 files changed, 9 insertions, 13 deletions

diff --git a/equivalence_map.cc b/equivalence_map.cc
index b85fe9f..0711bfb 100644
--- a/equivalence_map.cc
+++ b/equivalence_map.cc
@@ -9,6 +9,7 @@
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/stl_util.h"
 #include "components/zucchini/encoded_view.h"
 #include "components/zucchini/patch_reader.h"
 #include "components/zucchini/suffix_array.h"
@@ -304,8 +305,7 @@ void OffsetMapper::ForwardProjectAll(std::vector<offset_t>* offsets) const {
       src = kInvalidOffset;
     }
   }
-  offsets->erase(std::remove(offsets->begin(), offsets->end(), kInvalidOffset),
-                 offsets->end());
+  base::Erase(*offsets, kInvalidOffset);
   offsets->shrink_to_fit();
 }
 
@@ -365,11 +365,9 @@ void OffsetMapper::PruneEquivalencesAndSortBySource(
   }
 
   // Discard all equivalences with length == 0.
-  equivalences->erase(std::remove_if(equivalences->begin(), equivalences->end(),
-                                     [](const Equivalence& equivalence) {
-                                       return equivalence.length == 0;
-                                     }),
-                      equivalences->end());
+  base::EraseIf(*equivalences, [](const Equivalence& equivalence) {
+    return equivalence.length == 0;
+  });
 }
 
 /******** EquivalenceMap ********/
@@ -541,12 +539,10 @@ void EquivalenceMap::Prune(
   }
 
   // Discard all candidates with similarity smaller than |min_similarity|.
-  candidates_.erase(
-      std::remove_if(candidates_.begin(), candidates_.end(),
-                     [min_similarity](const EquivalenceCandidate& candidate) {
-                       return candidate.similarity < min_similarity;
-                     }),
-      candidates_.end());
+  base::EraseIf(candidates_,
+                [min_similarity](const EquivalenceCandidate& candidate) {
+                  return candidate.similarity < min_similarity;
+                });
 }
 
 }  // namespace zucchini