MacViews: Remove aura dependency from omnibox_view_views_browsertest

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 "base/command_line.h"
 #include "chrome/browser/search_engines/template_url_service_factory.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/browser_window_testing_views.h"
 #include "chrome/browser/ui/location_bar/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/browser/ui/views/location_bar/location_bar_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/aura/window.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
 
@@ skipping 33 matching lines @@
 
     if (press_location != release_location)
       ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(release_location));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::UP));
   }
 
   // Tap the center of the browser window.
   void TapBrowserWindowCenter() {
     gfx::Point center = BrowserView::GetBrowserViewForBrowser(
         browser())->GetBoundsInScreen().CenterPoint();
-    ui::test::EventGenerator generator(
-        browser()->window()->GetNativeWindow()->GetRootWindow());

[tapted, 2014/08/05 13:52:13]

note that events are always sent via the window host, and
aura::Window::GetHost()'s first step is to go to the RootWindow, so not much
changes here.

+    ui::test::EventGenerator generator(browser()->window()->GetNativeWindow());
     generator.GestureTapAt(center);
   }
 
   // Touch down and release at the specified locations.
   void Tap(const gfx::Point& press_location,
            const gfx::Point& release_location) {
-    ui::EventProcessor* dispatcher =
-        browser()->window()->GetNativeWindow()->GetHost()->event_processor();
-
-    base::TimeDelta timestamp = ui::EventTimeForNow();
-    ui::TouchEvent press(
-        ui::ET_TOUCH_PRESSED, press_location, 5, timestamp);
-    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
-    ASSERT_FALSE(details.dispatcher_destroyed);

[tapted, 2014/08/05 13:52:13]

note there is a CHECK at EventGenerator::DoDispatchEvent which does this as well

-
-    if (press_location != release_location) {
-      timestamp += base::TimeDelta::FromMilliseconds(10);
-      ui::TouchEvent move(
-          ui::ET_TOUCH_MOVED, release_location, 5, timestamp);
-      details = dispatcher->OnEventFromSource(&move);
+    ui::test::EventGenerator generator(browser()->window()->GetNativeWindow());
+    if (press_location == release_location) {
+      generator.GestureTapAt(press_location);
+    } else {
+      generator.GestureScrollSequence(press_location,
+                                      release_location,
+                                      base::TimeDelta::FromMilliseconds(10),
+                                      1);
     }
-
-    timestamp += base::TimeDelta::FromMilliseconds(50);
-    ui::TouchEvent release(
-        ui::ET_TOUCH_RELEASED, release_location, 5, timestamp);
-    details = dispatcher->OnEventFromSource(&release);
-    ASSERT_FALSE(details.dispatcher_destroyed);
   }
 
  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 234 matching lines @@
   // TextInputFocusManager completes.
   chrome::FocusLocationBar(browser());
   OmniboxView* view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view));
   OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view);
   ui::TextInputFocusManager* text_input_focus_manager =
       ui::TextInputFocusManager::GetInstance();
   EXPECT_EQ(omnibox_view_views->GetTextInputClient(),
             text_input_focus_manager->GetFocusedTextInputClient());
 }