aura: Remove event-dispatch methods from WindowTreeHostDelegate interface.

chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc

 // Copyright (c) 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/test/ui_controls.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host_delegate.h"
 #endif // defined(USE_AURA)
 
 class OmniboxViewViewsTest : public InProcessBrowserTest {
  protected:
   OmniboxViewViewsTest() {}
 
   static void GetOmniboxViewForBrowser(const Browser* browser,
                                        OmniboxView** omnibox_view) {
@@ skipping 26 matching lines @@
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::DOWN));
 
     if (press_location != release_location)
       ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(release_location));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::UP));
   }
 
 #if defined(USE_AURA)
   // Tap the center of the browser window.
   void TapBrowserWindowCenter() {
-    aura::WindowTreeHostDelegate* rwhd =
-        browser()->window()->GetNativeWindow()->GetRootWindow()->
-        GetDispatcher()->AsWindowTreeHostDelegate();
-
     gfx::Point center = BrowserView::GetBrowserViewForBrowser(
         browser())->GetBoundsInScreen().CenterPoint();
-    ui::TouchEvent press(ui::ET_TOUCH_PRESSED, center,
-                         5, base::TimeDelta::FromMilliseconds(0));
-    rwhd->OnHostTouchEvent(&press);
-
-    ui::TouchEvent release(ui::ET_TOUCH_RELEASED, center,
-                           5, base::TimeDelta::FromMilliseconds(50));
-    rwhd->OnHostTouchEvent(&release);
+    aura::test::EventGenerator generator(browser()->window()->
+        GetNativeWindow()->GetRootWindow());
+    generator.GestureTapAt(center);
   }
 
   // Touch down and release at the specified locations.
   void Tap(const gfx::Point& press_location,
            const gfx::Point& release_location) {
-    aura::WindowTreeHostDelegate* rwhd =
-        browser()->window()->GetNativeWindow()->GetRootWindow()->
-        GetDispatcher()->AsWindowTreeHostDelegate();
+    aura::WindowEventDispatcher* dispatcher =
+        browser()->window()->GetNativeWindow()->GetDispatcher();
 
     ui::TouchEvent press(ui::ET_TOUCH_PRESSED, press_location,
                          5, base::TimeDelta::FromMilliseconds(0));
-    rwhd->OnHostTouchEvent(&press);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
+    ASSERT_FALSE(details.dispatcher_destroyed);
 
     ui::TouchEvent release(ui::ET_TOUCH_RELEASED, release_location,
                            5, base::TimeDelta::FromMilliseconds(50));
-    rwhd->OnHostTouchEvent(&release);
+    details = dispatcher->OnEventFromSource(&release);
+    ASSERT_FALSE(details.dispatcher_destroyed);
   }
 #endif // defined(USE_AURA)
 
  private:
   // InProcessBrowserTest:
   virtual void SetUpOnMainThread() OVERRIDE {
     ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
     chrome::FocusLocationBar(browser());
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
   }
@@ skipping 113 matching lines @@
   // not there was text under the tap, which appears to be flaky.
 
   // Take the focus away and tap in the omnibox again, but drag a bit before
   // releasing.  We should focus the omnibox but not select all of its text.
   ASSERT_NO_FATAL_FAILURE(TapBrowserWindowCenter());
   ASSERT_NO_FATAL_FAILURE(Tap(tap_location, tap2_location));
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 #endif // defined(USE_AURA)