diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 21:54:02 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 21:54:02 +0000 |
| commit | 39bfbe6452c506dc0113a1497c19efbe728cf6ce (patch) | |
| tree | b239435f5dddcf4ca9182ffe5c53815b35693cde /chrome/test/base/view_event_test_base.cc | |
| parent | 7b76cbe39951142075141ca721fecb403e7beeea (diff) | |
| download | chromium_src-39bfbe6452c506dc0113a1497c19efbe728cf6ce.zip chromium_src-39bfbe6452c506dc0113a1497c19efbe728cf6ce.tar.gz chromium_src-39bfbe6452c506dc0113a1497c19efbe728cf6ce.tar.bz2 | |
Reenable the BookmarkBarViewTest8.DNDBackToOriginatingMenu test on AURA.
While instantiating the Shell class for the duration of the tests, we pass in a ShellDelegate
which is implemented by the TestShellDelegate class. This should ensure that the tests run without
assuming that the screen is locked.
The code to remove registered EventClients has been removed.
BUG=158564
R=ben
Review URL: https://codereview.chromium.org/11347051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/view_event_test_base.cc')
| -rw-r--r-- | chrome/test/base/view_event_test_base.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 2bfa51b..f3948d1 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -18,7 +18,9 @@ #if defined(USE_ASH) #include "ash/shell.h" +#include "ash/test/test_shell_delegate.h" #endif + #if defined(USE_AURA) #include "ui/aura/client/event_client.h" #include "ui/aura/env.h" @@ -86,11 +88,7 @@ void ViewEventTestBase::SetUp() { ui::TextInputTestSupport::Initialize(); ui::CompositorTestSupport::Initialize(); #if defined(USE_ASH) - ash::Shell::CreateInstance(NULL); - // The shell runs with a locked screen in tests, so we must clear the event - // client so it doesn't interfere with event propagation. - aura::client::SetEventClient(ash::Shell::GetPrimaryRootWindow(), - NULL); + ash::Shell::CreateInstance(new ash::test::TestShellDelegate()); #endif window_ = views::Widget::CreateWindow(this); } |