Revert of Avoid two targeting phases in aura client-lib and EventProcessor.

ui/events/test/test_event_processor.h

Index: ui/events/test/test_event_processor.h
diff --git a/ui/events/test/test_event_processor.h b/ui/events/test/test_event_processor.h
index 1e484a45a593e55309c1b65ed1003d7a0be2de15..9b71282138d76e4b1577ad9f3dff938b0c94b086 100644
--- a/ui/events/test/test_event_processor.h
+++ b/ui/events/test/test_event_processor.h
@@ -30,14 +30,12 @@
     should_processing_occur_ = occur;
   }
 
-  EventTarget* GetRoot();
   void SetRoot(std::unique_ptr<EventTarget> root);
   void Reset();
 
   // EventProcessor:
   bool CanDispatchToTarget(EventTarget* target) override;
-  EventTarget* GetRootForEvent(Event* event) override;
-  EventTargeter* GetDefaultEventTargeter() override;
+  EventTarget* GetRootTarget() override;
   EventDispatchDetails OnEventFromSource(Event* event) override;
   void OnEventProcessingStarted(Event* event) override;
   void OnEventProcessingFinished(Event* event) override;