diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-20 19:02:54 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-20 19:02:54 +0000 |
| commit | 380a8bdf8b4bbd683e0e1b2a9d247f5b5ad9f6f0 (patch) | |
| tree | edd270dee74b31f1359d9390fff67d4f47d48db9 /ui/aura/test/aura_test_helper.cc | |
| parent | 3989fd396df575f42424e9aa22c3050742a5e486 (diff) | |
| download | chromium_src-380a8bdf8b4bbd683e0e1b2a9d247f5b5ad9f6f0.zip chromium_src-380a8bdf8b4bbd683e0e1b2a9d247f5b5ad9f6f0.tar.gz chromium_src-380a8bdf8b4bbd683e0e1b2a9d247f5b5ad9f6f0.tar.bz2 | |
Move ContextFactory setup out of AuraTestHelper.
Some users of the test helper want to use ImageTransportFactory, which
also sets up a ContextFactory, meaning we end up setting up 2
ContextFactories currently for those tests. A DCHECK() added to
ContextFactory::SetInstance() caught this. So I've moved the
ContextFactory setup from AuraTestHelper to each of its owners.
While doing so, the the |allow_test_contexts| flag has been inverted
to |enable_pixel_output| since we'll be removing the concept of
test compositor/contexts from these tests.
R=piman@chromium.org
TBR=ben@chromium.org, piman@chromium.org
BUG=270918
Review URL: https://codereview.chromium.org/173113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test/aura_test_helper.cc')
| -rw-r--r-- | ui/aura/test/aura_test_helper.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index ffbd494..9dc1181 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc @@ -22,7 +22,6 @@ #include "ui/compositor/compositor.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" -#include "ui/compositor/test/context_factories_for_test.h" #include "ui/gfx/screen.h" #if defined(USE_X11) @@ -54,12 +53,9 @@ AuraTestHelper::~AuraTestHelper() { << "AuraTestHelper::TearDown() never called."; } -void AuraTestHelper::SetUp(bool allow_test_contexts) { +void AuraTestHelper::SetUp() { setup_called_ = true; - // The ContextFactory must exist before any Compositors are created. - ui::InitializeContextFactoryForTests(allow_test_contexts); - Env::CreateInstance(); // Unit tests generally don't want to query the system, rather use the state // from RootWindow. @@ -108,8 +104,6 @@ void AuraTestHelper::TearDown() { ui::ShutdownInputMethodForTesting(); Env::DeleteInstance(); - - ui::TerminateContextFactoryForTests(); } void AuraTestHelper::RunAllPendingInMessageLoop() { |