Use base::EraseIf() instead of erase(std::remove_if()) in content/

This patch simplifies conditions around the code in content/.

Bug: 875665
Change-Id: I52e639adce40a86e20304ee64c52d3b399c39841
Reviewed-on: https://chromium-review.googlesource.com/1215147Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Jinho Bang <jinho.bang@samsung.com>
Cr-Commit-Position: refs/heads/master@{#596261}

AUTHORS

@@ -920,6 +920,7 @@ Yarin Kaul <yarin.kaul@gmail.com>
 Yash Vempati <vempatiy@amazon.com>
 Ye Liu <cbakgly@gmail.com>
 Yeol Park <peary2@gmail.com>
+Yeonwoo Jo <yeonwoo.jo.92@gmail.com>
 Yi Shen <yi.shen@samsung.com>
 Yi Sun <ratsunny@gmail.com>
 Yichen Jiang <jiangyichen123@gmail.com>

content/browser/media/media_internals.cc

@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ -873,11 +874,9 @@ void MediaInternals::SaveEvent(int process_id,
     // Remove all events for a given player as soon as we have to remove a
     // single event for that player to avoid showing incomplete players.
     const int id_to_remove = saved_events.front().id;
-    saved_events.erase(std::remove_if(saved_events.begin(), saved_events.end(),
-                                      [&](const media::MediaLogEvent& event) {
-                                        return event.id == id_to_remove;
-                                      }),
-                       saved_events.end());
+    base::EraseIf(saved_events, [&](const media::MediaLogEvent& event) {
+      return event.id == id_to_remove;
+    });
   }
 }
 

content/browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc

@@ -14,6 +14,7 @@
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/renderer_host/input/timeout_monitor.h"
@@ -155,9 +156,7 @@ class PassthroughTouchEventQueueTest : public testing::Test,
                                int unique_event_id) {
     queue_->ProcessTouchAck(InputEventAckSource::COMPOSITOR_THREAD, ack_result,
                             ui::LatencyInfo(), unique_event_id);
-    sent_events_ids_.erase(std::remove(sent_events_ids_.begin(),
-                                       sent_events_ids_.end(), unique_event_id),
-                           sent_events_ids_.end());
+    base::Erase(sent_events_ids_, unique_event_id);
   }
 
   void SendGestureEventAck(WebInputEvent::Type type,

content/browser/renderer_host/media/media_devices_manager.cc

@@ -14,6 +14,7 @@
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/sequence_checker.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
 #include "base/task_runner_util.h"
@@ -587,11 +588,9 @@ media::VideoCaptureFormats MediaDevicesManager::GetVideoInputFormats(
   video_capture_manager_->GetDeviceSupportedFormats(device_id, &formats);
   ReplaceInvalidFrameRatesWithFallback(&formats);
   // Remove formats that have zero resolution.
-  formats.erase(std::remove_if(formats.begin(), formats.end(),
-                               [](const media::VideoCaptureFormat& format) {
-                                 return format.frame_size.GetArea() <= 0;
-                               }),
-                formats.end());
+  base::EraseIf(formats, [](const media::VideoCaptureFormat& format) {
+    return format.frame_size.GetArea() <= 0;
+  });
 
   // If the device does not report any valid format, use a fallback list of
   // standard formats.

content/browser/webrtc/webrtc_depth_capture_browsertest.cc

@@ -5,6 +5,7 @@
 #include <stddef.h>
 
 #include "base/command_line.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
@@ -34,12 +35,10 @@ void RemoveSwitchFromCommandLine(base::CommandLine* command_line,
 #else
       switch_value;
 #endif
-  argv.erase(std::remove_if(
-                 argv.begin(), argv.end(),
-                 [switch_string](const base::CommandLine::StringType& value) {
-                   return value.find(switch_string) != std::string::npos;
-                 }),
-             argv.end());
+  base::EraseIf(argv,
+                [switch_string](const base::CommandLine::StringType& value) {
+                  return value.find(switch_string) != std::string::npos;
+                });
   command_line->InitFromArgv(argv);
 }
 

content/browser/webrtc/webrtc_webcam_browsertest.cc

@@ -5,6 +5,7 @@
 #include "content/browser/webrtc/webrtc_webcam_browsertest.h"
 
 #include "base/command_line.h"
+#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ -32,9 +33,7 @@ bool IsUseFakeDeviceForMediaStream(const base::CommandLine::StringType& arg) {
 
 void RemoveFakeDeviceFromCommandLine(base::CommandLine* command_line) {
   base::CommandLine::StringVector argv = command_line->argv();
-  argv.erase(std::remove_if(argv.begin(), argv.end(),
-                            IsUseFakeDeviceForMediaStream),
-             argv.end());
+  base::EraseIf(argv, IsUseFakeDeviceForMediaStream);
   command_line->InitFromArgv(argv);
 }
 

content/renderer/media/audio/audio_renderer_sink_cache_impl.cc

@@ -12,6 +12,7 @@
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
@@ -337,16 +338,13 @@ void AudioRendererSinkCacheImpl::CacheOrStopUnusedSink(
 
 void AudioRendererSinkCacheImpl::DropSinksForFrame(int source_render_frame_id) {
   base::AutoLock auto_lock(cache_lock_);
-  cache_.erase(std::remove_if(cache_.begin(), cache_.end(),
-                              [source_render_frame_id](const CacheEntry& val) {
-                                if (val.source_render_frame_id ==
-                                    source_render_frame_id) {
-                                  val.sink->Stop();
-                                  return true;
-                                }
-                                return false;
-                              }),
-               cache_.end());
+  base::EraseIf(cache_, [source_render_frame_id](const CacheEntry& val) {
+    if (val.source_render_frame_id == source_render_frame_id) {
+      val.sink->Stop();
+      return true;
+    }
+    return false;
+  });
 }
 
 int AudioRendererSinkCacheImpl::GetCacheSizeForTesting() {

content/renderer/media/webrtc/webrtc_audio_renderer.cc

@@ -624,8 +624,7 @@ void WebRtcAudioRenderer::OnPlayStateRemoved(PlayingState* state) {
        it != source_playing_states_.end();) {
     PlayingStates& states = it->second;
     // We cannot use RemovePlayingState as it might invalidate |it|.
-    states.erase(std::remove(states.begin(), states.end(), state),
-                 states.end());
+    base::Erase(states, state);
     if (states.empty())
       it = source_playing_states_.erase(it);
     else

content/test/web_contents_observer_sanity_checker.cc

@@ -5,6 +5,7 @@
 #include "content/test/web_contents_observer_sanity_checker.h"
 
 #include "base/memory/ptr_util.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
@@ -280,9 +281,7 @@ void WebContentsObserverSanityChecker::MediaStoppedPlaying(
   CHECK(!web_contents_destroyed_);
   CHECK(std::find(active_media_players_.begin(), active_media_players_.end(),
                   id) != active_media_players_.end());
-  active_media_players_.erase(std::remove(active_media_players_.begin(),
-                                          active_media_players_.end(), id),
-                              active_media_players_.end());
+  base::Erase(active_media_players_, id);
 }
 
 bool WebContentsObserverSanityChecker::OnMessageReceived(