diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 05:52:20 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 05:53:42 +0000 |
| commit | 1f0ece91df08a1e162fd8a94bf819233b6d87eb2 (patch) | |
| tree | f71dc606bc51eeefee449784d17eaa41daa1ddc8 /athena | |
| parent | 59835a5d6d88b30a7cf6dee19ea2b9d03337c903 (diff) | |
| download | chromium_src-1f0ece91df08a1e162fd8a94bf819233b6d87eb2.zip chromium_src-1f0ece91df08a1e162fd8a94bf819233b6d87eb2.tar.gz chromium_src-1f0ece91df08a1e162fd8a94bf819233b6d87eb2.tar.bz2 | |
Fix events_test_support layering violation, missing dependencies
EventGenerator currently depends on a backreference for the
EventGeneratorDelegate factory function, which it can get away with in
gyp because events_test_support is statically linked.
This CL solves the layering violation by requiring TestHelper and
TestBase classes that require the event generator to initialize a
default delegate, similar to how ViewsDelegate solves a similar layering
problem. It was tested by temporarily making events_test_support a
component library, which exposed some missing dependencies.
With this, events_unittests links properly with GN, with sources
matching gyp.
BUG=399106
R=brettw@chromium.org,sadrul@chromium.org,oshima@chromium.org
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/429803005
Cr-Commit-Position: refs/heads/master@{#288663}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/test/athena_test_base.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/athena/test/athena_test_base.cc b/athena/test/athena_test_base.cc index a8ee6d3..8ddc437 100644 --- a/athena/test/athena_test_base.cc +++ b/athena/test/athena_test_base.cc @@ -5,6 +5,7 @@ #include "athena/test/athena_test_base.h" #include "athena/test/athena_test_helper.h" +#include "ui/aura/test/event_generator_delegate_aura.h" #include "ui/compositor/test/context_factories_for_test.h" #if defined(USE_X11) @@ -38,6 +39,7 @@ void AthenaTestBase::SetUp() { #if defined(USE_X11) aura::test::SetUseOverrideRedirectWindowByDefault(true); #endif + aura::test::InitializeAuraEventGeneratorDelegate(); helper_->SetUp(context_factory); } |