Reland: Fix X11TopmostWindowFinder

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

Index: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
index b0f4c81939652f4f9ff18083f454249a009a2c0a..8a48ad13f95a6e7867d0de0c2b396a9ef6beaafa 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
@@ -328,7 +328,7 @@ TEST_F(DesktopScreenX11Test, GetWindowAtScreenPoint) {
   ASSERT_EQ(3u, DesktopWindowTreeHostX11::GetAllOpenWindows().size());
 
   EXPECT_EQ(window_one->GetNativeWindow(),
-            screen()->GetWindowAtScreenPoint(gfx::Point(115, 115)));
+            screen()->GetWindowAtScreenPoint(gfx::Point(117, 117)));

[pkotwicz, 2014/05/16 16:56:56]

The code now takes into account the fact that the window has rounded corners. So
we cannot use the coordinates of the top left hand corner of |window_three|.

   EXPECT_EQ(window_two->GetNativeWindow(),
             screen()->GetWindowAtScreenPoint(gfx::Point(155, 155)));
   EXPECT_EQ(NULL,
@@ -341,7 +341,7 @@ TEST_F(DesktopScreenX11Test, GetWindowAtScreenPoint) {
   activation_waiter.Wait();
 
   EXPECT_EQ(window_three->GetNativeWindow(),
-            screen()->GetWindowAtScreenPoint(gfx::Point(115, 115)));
+            screen()->GetWindowAtScreenPoint(gfx::Point(117, 117)));
 
   window_one->CloseNow();
   window_two->CloseNow();