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

ash/wm/workspace_controller_unittest.cc

 // Copyright 2013 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 "ash/common/wm/workspace_controller.h"
 
 #include <map>
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
@@ skipping 1463 matching lines @@
   std::unique_ptr<Window> first(aura::test::CreateTestWindowWithDelegate(
       &d_first, 123, gfx::Rect(20, 10, 100, 50), NULL));
   ParentWindowInPrimaryRootWindow(first.get());
   first->Show();
 
   std::unique_ptr<Window> second(aura::test::CreateTestWindowWithDelegate(
       &d_second, 234, gfx::Rect(30, 40, 40, 10), NULL));
   ParentWindowInPrimaryRootWindow(second.get());
   second->Show();
 
-  aura::Window* root = first->GetRootWindow();
-  ui::EventTargeter* targeter =
-      root->GetHost()->dispatcher()->GetDefaultEventTargeter();
+  ui::EventTarget* root = first->GetRootWindow();
+  ui::EventTargeter* targeter = root->GetEventTargeter();
 
   // The windows overlap, and |second| is on top of |first|. Events targeted
   // slightly outside the edges of the |second| window should still be targeted
   // to |second| to allow resizing the windows easily.
 
   const int kNumPoints = 4;
   struct {
     const char* direction;
     gfx::Point location;
   } points[kNumPoints] = {
@@ skipping 27 matching lines @@
     transform.Translate(70, 40);
     second->SetTransform(transform);
   }
 }
 
 // Verifies mouse event targeting just outside the window edges for panels.
 TEST_F(WorkspaceControllerTest, WindowEdgeMouseHitTestPanel) {
   aura::test::TestWindowDelegate delegate;
   std::unique_ptr<Window> window(
       CreateTestPanel(&delegate, gfx::Rect(20, 10, 100, 50)));
-  aura::Window* root = window->GetRootWindow();
-  ui::EventTargeter* targeter =
-      root->GetHost()->dispatcher()->GetDefaultEventTargeter();
+  ui::EventTarget* root = window->GetRootWindow();
+  ui::EventTargeter* targeter = root->GetEventTargeter();
   const gfx::Rect bounds = window->bounds();
   const int kNumPoints = 5;
   struct {
     const char* direction;
     gfx::Point location;
     bool is_target_hit;
   } points[kNumPoints] = {
       {"left", gfx::Point(bounds.x() - 2, bounds.y() + 10), true},
       {"top", gfx::Point(bounds.x() + 10, bounds.y() - 2), true},
       {"right", gfx::Point(bounds.right() + 2, bounds.y() + 10), true},
@@ skipping 14 matching lines @@
 }
 
 // Verifies touch event targeting just outside the window edges for panels.
 // The shelf is aligned to the bottom by default, and so touches just below
 // the bottom edge of the panel should not target the panel itself because
 // an AttachedPanelWindowTargeter is installed on the panel container.
 TEST_F(WorkspaceControllerTest, WindowEdgeTouchHitTestPanel) {
   aura::test::TestWindowDelegate delegate;
   std::unique_ptr<Window> window(
       CreateTestPanel(&delegate, gfx::Rect(20, 10, 100, 50)));
-  aura::Window* root = window->GetRootWindow();
-  ui::EventTargeter* targeter =
-      root->GetHost()->dispatcher()->GetDefaultEventTargeter();
+  ui::EventTarget* root = window->GetRootWindow();
+  ui::EventTargeter* targeter = root->GetEventTargeter();
   const gfx::Rect bounds = window->bounds();
   const int kNumPoints = 5;
   struct {
     const char* direction;
     gfx::Point location;
     bool is_target_hit;
   } points[kNumPoints] = {
       {"left", gfx::Point(bounds.x() - 2, bounds.y() + 10), true},
       {"top", gfx::Point(bounds.x() + 10, bounds.y() - 2), true},
       {"right", gfx::Point(bounds.right() + 2, bounds.y() + 10), true},
@@ skipping 19 matching lines @@
   // Make window smaller than the minimum docked area so that the window edges
   // are exposed.
   delegate.set_maximum_size(gfx::Size(180, 200));
   std::unique_ptr<Window> window(aura::test::CreateTestWindowWithDelegate(
       &delegate, 123, gfx::Rect(20, 10, 100, 50), NULL));
   ParentWindowInPrimaryRootWindow(window.get());
   aura::Window* docked_container = Shell::GetContainer(
       window->GetRootWindow(), kShellWindowId_DockedContainer);
   docked_container->AddChild(window.get());
   window->Show();
-  aura::Window* root = window->GetRootWindow();
-  ui::EventTargeter* targeter =
-      root->GetHost()->dispatcher()->GetDefaultEventTargeter();
+  ui::EventTarget* root = window->GetRootWindow();
+  ui::EventTargeter* targeter = root->GetEventTargeter();
   const gfx::Rect bounds = window->bounds();
   const int kNumPoints = 5;
   struct {
     const char* direction;
     gfx::Point location;
     bool is_target_hit;
   } points[kNumPoints] = {
       {"left", gfx::Point(bounds.x() - 2, bounds.y() + 10), true},
       {"top", gfx::Point(bounds.x() + 10, bounds.y() - 2), true},
       {"right", gfx::Point(bounds.right() + 2, bounds.y() + 10), true},
@@ skipping 15 matching lines @@
                          ui::EventTimeForNow());
     target = targeter->FindTargetForEvent(root, &touch);
     if (points[i].is_target_hit)
       EXPECT_EQ(window.get(), target);
     else
       EXPECT_NE(window.get(), target);
   }
 }
 
 }  // namespace ash