Revert "Use WS_POPUP for ash_unittests"

ash/extended_desktop_unittest.cc

Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index d43fe021c078ce182cfe2224ae8691d0b9f931e1..1d2b49ed56bca3dd43151a199cd3fed8ea6f6a49 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -325,7 +325,14 @@ TEST_F(ExtendedDesktopTest, GetRootWindowMatching) {
             wm::GetRootWindowMatching(gfx::Rect(0, 1000, 50, 50)));
 }
 
-TEST_F(ExtendedDesktopTest, Capture) {
+#if defined(OS_WIN)
+// TODO(mazda): Re-enable this (http://crbug.com/150986).
+#define MAYBE_Capture DISABLED_Capture
+#else
+#define MAYBE_Capture Capture
+#endif
+
+TEST_F(ExtendedDesktopTest, MAYBE_Capture) {
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
@@ -352,7 +359,11 @@ TEST_F(ExtendedDesktopTest, Capture) {
   // The mouse is outside. On chromeos, the mouse is warped to the
   // dest root window, but it's not implemented on Win yet, so
   // no mouse move event on Win.
+#if defined(OS_WIN)
+  EXPECT_EQ("1 0 0", r1_d1.GetMouseMotionCountsAndReset());
+#else
   EXPECT_EQ("1 1 0", r1_d1.GetMouseMotionCountsAndReset());
+#endif
   EXPECT_EQ("1 1", r1_d1.GetMouseButtonCountsAndReset());
   // (15,15) on 1st display is (-985,15) on 2nd display.
   generator2.MoveMouseTo(-985, 15);
@@ -431,7 +442,13 @@ TEST_F(ExtendedDesktopTest, MoveWindowByMouseClick) {
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
 }
 
-TEST_F(ExtendedDesktopTest, MoveWindowToDisplay) {
+// This test fails on the "Win Aura" bot: <http://crbug.com/157817>.
+#if defined(OS_WIN)
+#define MAYBE_MoveWindowToDisplay DISABLED_MoveWindowToDisplay
+#else
+#define MAYBE_MoveWindowToDisplay MoveWindowToDisplay
+#endif
+TEST_F(ExtendedDesktopTest, MAYBE_MoveWindowToDisplay) {
   UpdateDisplay("1000x1000,1000x1000");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();