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

ui/views/bubble/bubble_window_targeter_unittest.cc

 // Copyright 2014 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/views/bubble/bubble_window_targeter.h"
 
 #include "base/macros.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
@@ skipping 60 matching lines @@
   }
 
   std::unique_ptr<Widget> anchor_;
   std::unique_ptr<Widget> bubble_widget_;
   BubbleDialogDelegateView* bubble_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleWindowTargeterTest);
 };
 
 TEST_F(BubbleWindowTargeterTest, HitTest) {
-  aura::Window* root = bubble_widget()->GetNativeWindow()->GetRootWindow();
-  ui::EventTargeter* targeter =
-      root->GetHost()->dispatcher()->GetDefaultEventTargeter();
+  ui::EventTarget* root = bubble_widget()->GetNativeWindow()->GetRootWindow();
+  ui::EventTargeter* targeter = root->GetEventTargeter();
   aura::Window* bubble_window = bubble_widget()->GetNativeWindow();
   gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow();
 
   {
     bubble_delegate()->set_margins(gfx::Insets());
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
                          bubble_bounds.origin(), ui::EventTimeForNow(),
                          ui::EF_NONE, ui::EF_NONE);
     EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1));
   }
@@ skipping 10 matching lines @@
   {
     bubble_delegate()->set_margins(gfx::Insets(20));
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
                          bubble_bounds.origin(), ui::EventTimeForNow(),
                          ui::EF_NONE, ui::EF_NONE);
     EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1));
   }
 }
 
 }  // namespace views