summaryrefslogtreecommitdiffstats
path: root/ui/aura/test/aura_test_base.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura/test/aura_test_base.cc')
-rw-r--r--ui/aura/test/aura_test_base.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 9a0a7ae..9784981 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -8,15 +8,13 @@
#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/test_screen.h"
#include "ui/aura/test/test_stacking_client.h"
#include "ui/aura/ui_controls_aura.h"
#include "ui/base/gestures/gesture_configuration.h"
+#include "ui/gfx/screen.h"
#include "ui/ui_controls/ui_controls.h"
-#if defined(USE_ASH)
-#include "ui/aura/test/test_screen.h"
-#endif
-
namespace aura {
namespace test {
@@ -53,9 +51,7 @@ void AuraTestBase::SetUp() {
Env::GetInstance()->SetMonitorManager(new SingleMonitorManager);
root_window_.reset(Env::GetInstance()->monitor_manager()->
CreateRootWindowForPrimaryMonitor());
-#if defined(USE_ASH)
gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
-#endif
ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
helper_.InitRootWindow(root_window());
helper_.SetUp();