MacViews: Add WidgetEventGenerator to abstract platform-specific event generation for tests.

ash/test/ash_test_base.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 "ash/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 37 matching lines @@
 #endif
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_connection.h"
 #endif
 
 namespace ash {
 namespace test {
 namespace {
 
-class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
+class AshEventGeneratorDelegate
+    : public aura::test::EventGeneratorDelegateAura {
  public:
   AshEventGeneratorDelegate() {}
   virtual ~AshEventGeneratorDelegate() {}
 
-  // aura::test::EventGeneratorDelegate overrides:
+  // aura::test::EventGeneratorDelegateAura overrides:
   virtual aura::WindowTreeHost* GetHostAt(
       const gfx::Point& point_in_screen) const OVERRIDE {
     gfx::Screen* screen = Shell::GetScreen();
     gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen);
     return Shell::GetInstance()->display_controller()->
         GetRootWindowForDisplayId(display.id())->GetHost();
   }
 
   virtual aura::client::ScreenPositionClient* GetScreenPositionClient(
       const aura::Window* window) const OVERRIDE {
@@ skipping 110 matching lines @@
   base::KillAllNamedProcessesWithArgument(win8::test::kDefaultTestExePath,
                                           kViewerProcessArgument);
 #endif
 
   event_generator_.reset();
   // Some tests set an internal display id,
   // reset it here, so other tests will continue in a clean environment.
   gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
 }
 
-aura::test::EventGenerator& AshTestBase::GetEventGenerator() {
+ui::test::EventGenerator& AshTestBase::GetEventGenerator() {
   if (!event_generator_) {
     event_generator_.reset(
-        new aura::test::EventGenerator(new AshEventGeneratorDelegate()));
+        new ui::test::EventGenerator(new AshEventGeneratorDelegate()));
   }
   return *event_generator_.get();
 }
 
 bool AshTestBase::SupportsMultipleDisplays() {
   return AshTestHelper::SupportsMultipleDisplays();
 }
 
 bool AshTestBase::SupportsHostWindowResize() {
   return AshTestHelper::SupportsHostWindowResize();
@@ skipping 126 matching lines @@
 
 void AshTestBase::UnblockUserSession() {
   Shell::GetInstance()->session_state_delegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 
 }  // namespace test
 }  // namespace ash