aura: Start converting event-filters into event-handlers.

ui/base/events/event_target.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/events/event_target.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "ui/base/events/event.h"
 
 namespace ui {
 
 EventTarget::EventTarget()
     : target_handler_(NULL) {
 }
 
 EventTarget::~EventTarget() {
 }
 
 void EventTarget::AddPreTargetHandler(EventHandler* handler) {
   pre_target_list_.push_back(handler);
 }
 
 void EventTarget::RemovePreTargetHandler(EventHandler* handler) {
-  pre_target_list_.erase(std::remove(pre_target_list_.begin(),
-      pre_target_list_.end(), handler));
+  EventHandlerList::iterator find =
+      std::find(pre_target_list_.begin(),
+                pre_target_list_.end(),
+                handler);
+  if (find != pre_target_list_.end())
+    pre_target_list_.erase(find);
 }
 
 void EventTarget::AddPostTargetHandler(EventHandler* handler) {
   post_target_list_.push_back(handler);
 }
 
 void EventTarget::RemovePostTargetHandler(EventHandler* handler) {
-  post_target_list_.erase(std::remove(post_target_list_.begin(),
-      post_target_list_.end(), handler));
+  EventHandlerList::iterator find =
+      std::find(post_target_list_.begin(),
+                post_target_list_.end(),
+                handler);
+  if (find != post_target_list_.end())
+    post_target_list_.erase(find);
 }
 
 void EventTarget::GetPreTargetHandlers(EventHandlerList* list) {
   EventTarget* target = this;
   while (target) {
     EventHandlerList::reverse_iterator it, rend;
     for (it = target->pre_target_list_.rbegin(),
             rend = target->pre_target_list_.rend();
         it != rend;
         ++it) {
@@ skipping 35 matching lines @@
                            TOUCH_STATUS_UNKNOWN;
 }
 
 EventResult EventTarget::OnGestureEvent(GestureEvent* event) {
   CHECK_EQ(this, event->target());
   return target_handler_ ? target_handler_->OnGestureEvent(event) :
                            ER_UNHANDLED;
 }
 
 }  // namespace ui