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

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 namespace gfx {
 class Rect;
 }
 
+namespace ui {
+namespace test {
+class EventGenerator;
+}
+}
+
 namespace aura {
 class RootWindow;
 class Window;
 class WindowDelegate;
-
-namespace test {
-class EventGenerator;
-}  // namespace test
 }  // namespace aura
 
 namespace ash {
 class DisplayManager;
 
 namespace test {
 
 class AshTestHelper;
 class TestScreenshotDelegate;
 class TestSystemTrayDelegate;
@@ skipping 35 matching lines @@
       ui::wm::WindowType type,
       int id,
       const gfx::Rect& bounds);
 
   // Attach |window| to the current shell's root window.
   void ParentWindowInPrimaryRootWindow(aura::Window* window);
 
   // Returns the EventGenerator that uses screen coordinates and works
   // across multiple displays. It createse a new generator if it
   // hasn't been created yet.
-  aura::test::EventGenerator& GetEventGenerator();
+  ui::test::EventGenerator& GetEventGenerator();
 
  protected:
   enum UserSessionBlockReason {
     FIRST_BLOCK_REASON,
     BLOCKED_BY_LOCK_SCREEN = FIRST_BLOCK_REASON,
     BLOCKED_BY_LOGIN_SCREEN,
     BLOCKED_BY_USER_ADDING_SCREEN,
     NUMBER_OF_BLOCK_REASONS
   };
 
@@ skipping 25 matching lines @@
   void BlockUserSession(UserSessionBlockReason block_reason);
   void UnblockUserSession();
 
  private:
   bool setup_called_;
   bool teardown_called_;
   // |SetUp()| doesn't activate session if this is set to false.
   bool start_session_;
   scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
   scoped_ptr<AshTestHelper> ash_test_helper_;
-  scoped_ptr<aura::test::EventGenerator> event_generator_;
+  scoped_ptr<ui::test::EventGenerator> event_generator_;
 #if defined(OS_WIN)
   // Note that the order is important here as ipc_thread_ should be destroyed
   // after metro_viewer_host_->channel_.
   scoped_ptr<base::Thread> ipc_thread_;
   scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_;
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 class NoSessionAshTestBase : public AshTestBase {
  public:
   NoSessionAshTestBase() {
     set_start_session(false);
   }
   virtual ~NoSessionAshTestBase() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_