diff options
Diffstat (limited to 'views/test/views_test_base.cc')
| -rw-r--r-- | views/test/views_test_base.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/views/test/views_test_base.cc b/views/test/views_test_base.cc index ae20b43..bbd8e75 100644 --- a/views/test/views_test_base.cc +++ b/views/test/views_test_base.cc @@ -13,6 +13,7 @@ #if defined(USE_AURA) #include "ui/aura/desktop.h" +#include "ui/aura/test_desktop_delegate.h" #endif namespace views { @@ -27,6 +28,9 @@ ViewsTestBase::ViewsTestBase() #if defined(OS_WIN) OleInitialize(NULL); #endif +#if defined(USE_AURA) + new aura::TestDesktopDelegate; +#endif } ViewsTestBase::~ViewsTestBase() { @@ -44,8 +48,6 @@ void ViewsTestBase::SetUp() { setup_called_ = true; #if defined(USE_AURA) aura::Desktop::set_compositor_factory_for_testing(&TestCreateCompositor); - if (!aura::Desktop::GetInstance()->default_parent()) - aura::Desktop::GetInstance()->CreateDefaultParentForTesting(); #else Widget::set_compositor_factory_for_testing(&TestCreateCompositor); #endif |