[master] x11: Move X event handling out of the message-pump.

ash/wm/ash_native_cursor_manager_interactive_uitest.cc

 // Copyright 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 "ash/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/events/platform/platform_event_source.h"
 #include "ui/gl/gl_surface.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
 #include "base/message_loop/message_pump_x11.h"
 #endif
 
 namespace ash {
 
 using ::wm::CursorManager;
 
 class AshNativeCursorManagerTest : public test::AshTestBase {
  public:
   AshNativeCursorManagerTest() {}
   virtual ~AshNativeCursorManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     gfx::GLSurface::InitializeOneOffForTests();
 
+    event_source_ = ui::PlatformEventSource::CreateDefault();
     ui::RegisterPathProvider();
     ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
     base::FilePath resources_pack_path;
     PathService::Get(base::DIR_MODULE, &resources_pack_path);
     resources_pack_path =
         resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
     ResourceBundle::GetSharedInstance().AddDataPackFromPath(
         resources_pack_path, ui::SCALE_FACTOR_NONE);
 
     test::AshTestBase::SetUp();
   }
+
+ private:
+  scoped_ptr<ui::PlatformEventSource> event_source_;
+
+  DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManagerTest);
 };
 
 namespace {
 
 internal::DisplayInfo CreateDisplayInfo(int64 id,
                                         const gfx::Rect& bounds,
                                         float device_scale_factor) {
   internal::DisplayInfo info(id, "", false);
   info.SetBounds(bounds);
   info.set_device_scale_factor(device_scale_factor);
@@ skipping 46 matching lines @@
   display_manager->OnNativeDisplaysChanged(display_info_list);
 
   MoveMouseSync(Shell::GetAllRootWindows()[0], 10, 10);
   EXPECT_EQ(1.0f, test_api.GetDisplay().device_scale_factor());
 
   MoveMouseSync(Shell::GetAllRootWindows()[0], 600, 10);
   EXPECT_EQ(2.0f, test_api.GetDisplay().device_scale_factor());
 }
 
 }  // namespace ash