diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 21:41:50 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 21:41:50 +0000 |
| commit | e703dfe0959014e0f5e2b3831723208614528164 (patch) | |
| tree | 97537b1e1e178b674a79d46b7835ebaa80bed56e /ash/shell_unittest.cc | |
| parent | 19b455af83ffc6f76142d86905da4f0ffeb3b544 (diff) | |
| download | chromium_src-e703dfe0959014e0f5e2b3831723208614528164.zip chromium_src-e703dfe0959014e0f5e2b3831723208614528164.tar.gz chromium_src-e703dfe0959014e0f5e2b3831723208614528164.tar.bz2 | |
events: Move test related functions into a separate target.
Move events test-related code into a separate target so that these don't get
used in non-test code. Notable changes:
* Move nested TestApi classes out of Event, LocatedEvent and EventTarget,
and into separate classes. The new classes become friends with their old
parents.
* Move events_x_utils out of x/ into test/
R=sky@chromium.org, tfarina@chromium.org
TBR=jam@ for content_tests.gypi and render_view_browsertest.cc changes.
BUG=none
Review URL: https://codereview.chromium.org/82903005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index c41163b..e48460d 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -30,6 +30,7 @@ #include "ui/aura/test/test_event_handler.h" #include "ui/aura/window.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/events/test/events_test_utils.h" #include "ui/gfx/size.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/controls/menu/menu_runner.h" @@ -390,9 +391,6 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) { } TEST_F(ShellTest, ManagedWindowModeBasics) { - Shell* shell = Shell::GetInstance(); - Shell::TestApi test_api(shell); - // We start with the usual window containers. ExpectAllContainers(); // Shelf is visible. @@ -495,7 +493,7 @@ TEST_F(ShellTest, ToggleAutoHide) { TEST_F(ShellTest, TestPreTargetHandlerOrder) { Shell* shell = Shell::GetInstance(); - Shell::TestApi test_api(shell); + ui::EventTargetTestApi test_api(shell); test::ShellTestApi shell_test_api(shell); const ui::EventHandlerList& handlers = test_api.pre_target_handlers(); |