Commit b4db19ff authored by peter's avatar peter Committed by Commit bot

Migrate two std::remove_if usages to use base::EraseIf instead

BUG=

Review-Url: https://codereview.chromium.org/2742973002
Cr-Commit-Position: refs/heads/master@{#456056}
parent 515d5521
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
#include "chrome/browser/notifications/notification_permission_context.h" #include "chrome/browser/notifications/notification_permission_context.h"
#include <algorithm>
#include <deque> #include <deque>
#include "base/callback.h" #include "base/callback.h"
#include "base/location.h" #include "base/location.h"
#include "base/rand_util.h" #include "base/rand_util.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "base/timer/timer.h" #include "base/timer/timer.h"
#include "chrome/browser/notifications/desktop_notification_profile_util.h" #include "chrome/browser/notifications/desktop_notification_profile_util.h"
...@@ -122,10 +122,7 @@ void VisibilityTimerTabHelper::PostTaskAfterVisibleDelay( ...@@ -122,10 +122,7 @@ void VisibilityTimerTabHelper::PostTaskAfterVisibleDelay(
void VisibilityTimerTabHelper::CancelTask(const PermissionRequestID& id) { void VisibilityTimerTabHelper::CancelTask(const PermissionRequestID& id) {
bool deleting_front = task_queue_.front().id == id; bool deleting_front = task_queue_.front().id == id;
task_queue_.erase( base::EraseIf(task_queue_, [id](const Task& task) { return task.id == id; });
std::remove_if(task_queue_.begin(), task_queue_.end(),
[id](const Task& task) { return task.id == id; }),
task_queue_.end());
if (!task_queue_.empty() && is_visible_ && deleting_front) if (!task_queue_.empty() && is_visible_ && deleting_front)
task_queue_.front().timer->Reset(); task_queue_.front().timer->Reset();
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/threading/sequenced_worker_pool.h" #include "base/threading/sequenced_worker_pool.h"
#include "content/browser/notifications/blink_notification_service_impl.h" #include "content/browser/notifications/blink_notification_service_impl.h"
#include "content/browser/notifications/notification_database.h" #include "content/browser/notifications/notification_database.h"
...@@ -131,13 +132,11 @@ void PlatformNotificationContextImpl::CreateServiceOnIO( ...@@ -131,13 +132,11 @@ void PlatformNotificationContextImpl::CreateServiceOnIO(
void PlatformNotificationContextImpl::RemoveService( void PlatformNotificationContextImpl::RemoveService(
BlinkNotificationServiceImpl* service) { BlinkNotificationServiceImpl* service) {
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
auto services_to_remove = std::remove_if( base::EraseIf(
services_.begin(), services_.end(), services_,
[service](const std::unique_ptr<BlinkNotificationServiceImpl>& ptr) { [service](const std::unique_ptr<BlinkNotificationServiceImpl>& ptr) {
return ptr.get() == service; return ptr.get() == service;
}); });
services_.erase(services_to_remove, services_.end());
} }
void PlatformNotificationContextImpl::ReadNotificationData( void PlatformNotificationContextImpl::ReadNotificationData(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment