Index: content/test/test_renderer_host.cc |
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc |
index 2f5aa251fdaf7ff81c5b1add5d82e99a85a4999c..cd9aa34c9bd4c5403d7c7e8b2485a747cd2bd08f 100644 |
--- a/content/test/test_renderer_host.cc |
+++ b/content/test/test_renderer_host.cc |
@@ -13,16 +13,14 @@ |
#include "content/test/mock_render_process_host.h" |
#include "content/test/test_browser_context.h" |
-#if defined(USE_ASH) |
-#include "ui/aura/test/test_screen.h" |
-#endif |
- |
#if defined(USE_AURA) |
#include "ui/aura/env.h" |
#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/gfx/screen.h" |
#endif |
namespace content { |
@@ -197,9 +195,7 @@ void RenderViewHostTestHarness::SetUp() { |
#if defined(USE_AURA) |
aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager); |
root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); |
-#if defined(USE_ASH) |
gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); |
-#endif // USE_ASH |
test_stacking_client_.reset( |
new aura::test::TestStackingClient(root_window_.get())); |
#endif // USE_AURA |