Revert of Fix X11TopmostWindowFinder

ui/base/x/x11_util.cc

Index: ui/base/x/x11_util.cc
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
index 8560f1bb594b79dbcf6d23f205aeef34b2382ca8..5ab953437ed56a3010bf012ebc9c18f146ba2633 100644
--- a/ui/base/x/x11_util.cc
+++ b/ui/base/x/x11_util.cc
@@ -224,6 +224,14 @@
   DISALLOW_COPY_AND_ASSIGN(XCustomCursorCache);
 };
 
+bool IsShapeAvailable() {
+  int dummy;
+  static bool is_shape_available =
+    XShapeQueryExtension(gfx::GetXDisplay(), &dummy, &dummy);
+  return is_shape_available;
+
+}
+
 }  // namespace
 
 bool IsXInput2Available() {
@@ -463,13 +471,6 @@
   return invisible_cursor;
 }
 
-bool IsShapeExtensionAvailable() {
-  int dummy;
-  static bool is_shape_available =
-      XShapeQueryExtension(gfx::GetXDisplay(), &dummy, &dummy);
-  return is_shape_available;
-}
-
 XID GetX11RootWindow() {
   return DefaultRootWindow(gfx::GetXDisplay());
 }
@@ -578,7 +579,7 @@
   if (!window_rect.Contains(screen_loc))
     return false;
 
-  if (!IsShapeExtensionAvailable())
+  if (!IsShapeAvailable())
     return true;
 
   // According to http://www.x.org/releases/X11R7.6/doc/libXext/shapelib.html,