Use WS_POPUP for ash_unittests

- Layout test windows starting from (1,1) and move
  mouse to (0,0) so that they don't overlap unless
  test moves the cursor.
- Enabled disabled tests.
- RootWindowHostWin::SetBounds should move the window
  and call OnHostResized when the scale factor has changed.

This also seems to fix the desktop size limitation issue (148691)
probably because a popup window can be larger than the desktop size.

BUG=150986,157817,141577,148691
TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=170621

Review URL: https://chromiumcodereview.appspot.com/11428066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170673 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 19 deletions

diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 1d2b49e..d43fe02 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -325,14 +325,7 @@ TEST_F(ExtendedDesktopTest, GetRootWindowMatching) {
             wm::GetRootWindowMatching(gfx::Rect(0, 1000, 50, 50)));
 }
 
-#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) {
+TEST_F(ExtendedDesktopTest, Capture) {
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
@@ -359,11 +352,7 @@ TEST_F(ExtendedDesktopTest, MAYBE_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);
@@ -442,13 +431,7 @@ TEST_F(ExtendedDesktopTest, MoveWindowByMouseClick) {
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
 }
 
-// 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) {
+TEST_F(ExtendedDesktopTest, MoveWindowToDisplay) {
   UpdateDisplay("1000x1000,1000x1000");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();