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

ash/shell_unittest.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/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 11 matching lines @@
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/events/platform/platform_event_source.h"
 #include "ui/events/test/events_test_utils.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/dialog_delegate.h"
 
 using aura::RootWindow;
@@ skipping 325 matching lines @@
 TEST_F(ShellTest, IsScreenLocked) {
   SessionStateDelegate* delegate =
       Shell::GetInstance()->session_state_delegate();
   delegate->LockScreen();
   EXPECT_TRUE(delegate->IsScreenLocked());
   delegate->UnlockScreen();
   EXPECT_FALSE(delegate->IsScreenLocked());
 }
 
 TEST_F(ShellTest, LockScreenClosesActiveMenu) {
+  scoped_ptr<ui::PlatformEventSource> event_source(
+      ui::PlatformEventSource::CreateDefault());
   SimpleMenuDelegate menu_delegate;
   scoped_ptr<ui::SimpleMenuModel> menu_model(
       new ui::SimpleMenuModel(&menu_delegate));
   menu_model->AddItem(0, base::ASCIIToUTF16("Menu item"));
   views::Widget* widget = ash::Shell::GetPrimaryRootWindowController()->
       wallpaper_controller()->widget();
   scoped_ptr<views::MenuRunner> menu_runner(
       new views::MenuRunner(menu_model.get()));
 
   // When MenuRunner runs a nested loop the LockScreenAndVerifyMenuClosed
@@ skipping 155 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash