Revert "Use WS_POPUP for ash_unittests"

ash/test/ash_test_base.cc

Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index e8d3514ec49fc608abd716f4c29ff7ea083351a1..479bc40ca88141b5523501964e73a37fc3f990cb 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -26,10 +26,6 @@
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
-#if defined(OS_WIN)
-#include "ui/aura/root_window_host_win.h"
-#endif
-
 namespace ash {
 namespace test {
 
@@ -47,13 +43,8 @@ AshTestBase::~AshTestBase() {
 }
 
 void AshTestBase::SetUp() {
-  // Use the origin (1,1) so that it doesn't over
-  // lap with the native mouse cursor.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kAuraHostWindowSize, "1+1-800x600");
-#if defined(OS_WIN)
-  aura::test::SetUsePopupAsRootWindowForTest(true);
-#endif
+      switches::kAuraHostWindowSize, "0+0-800x600");
   // Disable animations during tests.
   ui::LayerAnimator::set_disable_animations_for_test(true);
   ui::TextInputTestSupport::Initialize();
@@ -62,9 +53,9 @@ void AshTestBase::SetUp() {
   ash::Shell::CreateInstance(test_shell_delegate_);
   Shell::GetPrimaryRootWindow()->Show();
   Shell::GetPrimaryRootWindow()->ShowRootWindow();
-  // Move the mouse cursor to (0,0) so that native events doesn't
+  // Move the mouse cursor to far away so that native events doesn't
   // interfere test expectations.
-  Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(0, 0));
+  Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
   Shell::GetInstance()->cursor_manager()->ShowCursor(true);
 }
 
@@ -76,9 +67,6 @@ void AshTestBase::TearDown() {
   Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   ui::TextInputTestSupport::Shutdown();
-#if defined(OS_WIN)
-  aura::test::SetUsePopupAsRootWindowForTest(false);
-#endif
 }
 
 void AshTestBase::ChangeDisplayConfig(float scale,