Revert "Use WS_POPUP for ash_unittests"

ash/extended_desktop_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 307 matching lines @@
   EXPECT_EQ(root_windows[0],
             wm::GetRootWindowMatching(gfx::Rect(100, 100, 0, 0)));
 
   // Out of range rect should return the primary root window.
   EXPECT_EQ(root_windows[0],
             wm::GetRootWindowMatching(gfx::Rect(-600, -300, 50, 50)));
   EXPECT_EQ(root_windows[0],
             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();
 
   aura::test::EventCountDelegate r1_d1;
   aura::test::EventCountDelegate r1_d2;
   aura::test::EventCountDelegate r2_d1;
 
   scoped_ptr<aura::Window> r1_w1(aura::test::CreateTestWindowWithDelegate(
       &r1_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[0]));
   scoped_ptr<aura::Window> r1_w2(aura::test::CreateTestWindowWithDelegate(
       &r1_d2, 0, gfx::Rect(10, 100, 100, 100), root_windows[0]));
   scoped_ptr<aura::Window> r2_w1(aura::test::CreateTestWindowWithDelegate(
       &r2_d1, 0, gfx::Rect(10, 10, 100, 100), root_windows[1]));
 
   r1_w1->SetCapture();
 
   EXPECT_EQ(r1_w1.get(),
             aura::client::GetCaptureWindow(r2_w1->GetRootWindow()));
   aura::test::EventGenerator generator2(root_windows[1]);
   generator2.MoveMouseToCenterOf(r2_w1.get());
   generator2.ClickLeftButton();
   EXPECT_EQ("0 0 0", r2_d1.GetMouseMotionCountsAndReset());
   EXPECT_EQ("0 0", r2_d1.GetMouseButtonCountsAndReset());
   // 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);
   EXPECT_EQ("0 1 0", r1_d1.GetMouseMotionCountsAndReset());
 
   r1_w2->SetCapture();
   EXPECT_EQ(r1_w2.get(),
             aura::client::GetCaptureWindow(r2_w1->GetRootWindow()));
   generator2.MoveMouseBy(10, 10);
   generator2.ClickLeftButton();
@@ skipping 58 matching lines @@
   MoveWindowByClickEventFilter event_filter(window.get());
   window->AddPreTargetHandler(&event_filter);
   aura::test::EventGenerator generator(root_windows[0], window.get());
   generator.ClickLeftButton();
   // Both mouse pressed and released arrive at the window and its delegate.
   EXPECT_EQ("1 1", delegate.GetMouseButtonCountsAndReset());
   // Also event_filter moves the window to another root at mouse release.
   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();
 
   gfx::Display display0 = Shell::GetScreen()->GetDisplayMatching(
       root_windows[0]->GetBoundsInScreen());
   gfx::Display display1 = Shell::GetScreen()->GetDisplayMatching(
       root_windows[1]->GetBoundsInScreen());
   EXPECT_NE(display0.id(), display1.id());
 
   views::Widget* d1 = CreateTestWidget(gfx::Rect(10, 10, 1000, 100));
@@ skipping 243 matching lines @@
 
   aura::test::EventGenerator generator22(root_windows[1]);
   generator22.PressKey(ui::VKEY_E, 0);
   generator22.ReleaseKey(ui::VKEY_E, 0);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
   EXPECT_EQ("abcde", UTF16ToASCII(textfield->text()));
 }
 
 }  // namespace internal
 }  // namespace ash