Replace erase(std::remove()) and erase(std::remove_if()) in net

This patch replaces the erase(std::remove()) and
erase(std::remove_if()) used in the net folder
with base::Erase() and base::EraseIf().

Bug: 875665
Change-Id: I3143eccb4da2f53e600c0a75f798e41af78e08dd
Reviewed-on: https://chromium-review.googlesource.com/1203514
Reviewed-by: Matt Mueller <mattm@chromium.org>
Commit-Queue: Jinho Bang <jinho.bang@samsung.com>
Cr-Commit-Position: refs/heads/master@{#589763}

Author: Eunseok Oh

net/nqe/observation_buffer.cc

@@ -10,6 +10,7 @@
 #include <utility>
 
 #include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "net/nqe/network_quality_estimator_params.h"
@@ -162,14 +163,11 @@ void ObservationBuffer::GetPercentileForEachHostWithCounts(
 
 void ObservationBuffer::RemoveObservationsWithSource(
     bool deleted_observation_sources[NETWORK_QUALITY_OBSERVATION_SOURCE_MAX]) {
-  observations_.erase(
-      std::remove_if(
-          observations_.begin(), observations_.end(),
-          [deleted_observation_sources](const Observation& observation) {
-            return deleted_observation_sources[static_cast<size_t>(
-                observation.source())];
-          }),
-      observations_.end());
+  base::EraseIf(observations_,
+                [deleted_observation_sources](const Observation& observation) {
+                  return deleted_observation_sources[static_cast<size_t>(
+                      observation.source())];
+                });
 }
 
 void ObservationBuffer::ComputeWeightedObservations(

net/url_request/url_request_test_job.cc

@@ -13,6 +13,7 @@
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/io_buffer.h"
@@ -180,10 +181,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request,
       weak_factory_(this) {}
 
 URLRequestTestJob::~URLRequestTestJob() {
-  g_pending_jobs.Get().erase(
-      std::remove(
-          g_pending_jobs.Get().begin(), g_pending_jobs.Get().end(), this),
-      g_pending_jobs.Get().end());
+  base::Erase(g_pending_jobs.Get(), this);
 }
 
 bool URLRequestTestJob::GetMimeType(std::string* mime_type) const {
@@ -320,10 +318,7 @@ void URLRequestTestJob::Kill() {
   stage_ = DONE;
   URLRequestJob::Kill();
   weak_factory_.InvalidateWeakPtrs();
-  g_pending_jobs.Get().erase(
-      std::remove(
-          g_pending_jobs.Get().begin(), g_pending_jobs.Get().end(), this),
-      g_pending_jobs.Get().end());
+  base::Erase(g_pending_jobs.Get(), this);
 }
 
 void URLRequestTestJob::ProcessNextOperation() {