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

ui/views/touchui/touch_selection_controller_impl_unittest.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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/test/test_cursor_client.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/resources/grit/ui_resources.h"
@@ skipping 764 matching lines @@
   EXPECT_FALSE(IsCursorHandleVisibleFor(touch_selection_controller.get()));
 
   touch_selection_controller.reset();
 }
 
 TEST_F(TouchSelectionControllerImplTest, HandlesStackAboveParent) {
   // TODO: see comment in SetUp().
   if (IsMus())
     return;
 
-  aura::Window* root = GetContext();
-  ui::EventTargeter* targeter =
-      root->GetHost()->dispatcher()->GetDefaultEventTargeter();
+  ui::EventTarget* root = GetContext();
+  ui::EventTargeter* targeter = root->GetEventTargeter();
 
   // Create the first window containing a Views::Textfield.
   CreateTextfield();
   aura::Window* window1 = textfield_widget_->GetNativeView();
 
   // Start touch editing, check that the handle is above the first window, and
   // end touch editing.
   StartTouchEditing();
   gfx::Point test_point = GetCursorHandleDragPoint();
   ui::MouseEvent test_event1(ui::ET_MOUSE_MOVED, test_point, test_point,
@@ skipping 106 matching lines @@
   // Start touch editing; then press a key and ensure it deactivates touch
   // selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.PressKey(ui::VKEY_A, 0);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 }  // namespace views