Re-land (2): Reimplement automation API on top of C++-backed AXTree.

chrome/browser/extensions/api/automation_internal/automation_event_router.cc

Index: chrome/browser/extensions/api/automation_internal/automation_event_router.cc
diff --git a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
index c62a3fa49cd733c8f440aa18ad3dc0adf8600a90..7be3332d2e80e193420d070684884a7a387a7097 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
@@ -62,7 +62,8 @@ void AutomationEventRouter::DispatchAccessibilityEvent(
 
     content::RenderProcessHost* rph =
         content::RenderProcessHost::FromID(listener.process_id);
-    rph->Send(new ExtensionMsg_AccessibilityEvent(listener.routing_id, params));
+    rph->Send(new ExtensionMsg_AccessibilityEvent(listener.routing_id,
+                                                  params));
   }
 }
 
@@ -93,7 +94,8 @@ void AutomationEventRouter::Register(
   auto iter = std::find_if(
       listeners_.begin(),
       listeners_.end(),
-      [listener_process_id, listener_routing_id](AutomationListener& item) {
+      [listener_process_id, listener_routing_id](
+          const AutomationListener& item) {
         return (item.process_id == listener_process_id &&
                 item.routing_id == listener_routing_id);
       });
@@ -129,12 +131,14 @@ void AutomationEventRouter::Observe(
   content::RenderProcessHost* rph =
       content::Source<content::RenderProcessHost>(source).ptr();
   int process_id = rph->GetID();
-  std::remove_if(
-      listeners_.begin(),
-      listeners_.end(),
-      [process_id](AutomationListener& item) {
-        return item.process_id = process_id;
-      });
+  listeners_.erase(
+      std::remove_if(
+          listeners_.begin(),
+          listeners_.end(),
+          [process_id](const AutomationListener& item) {
+            return item.process_id == process_id;
+          }),
+      listeners_.end());
 }
 
 }  // namespace extensions