Reenable X11TopmostWindowFinderTests

ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc

 // Copyright 2014 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 "ui/views/widget/desktop_aura/x11_topmost_window_finder.h"
 
 #include <algorithm>
 #include <vector>
 #include <X11/extensions/shape.h>
 #include <X11/Xlib.h>
 #include <X11/Xregion.h>
 
 // Get rid of X11 macros which conflict with gtest.
 #undef Bool
 #undef None
 
 #include "base/memory/scoped_ptr.h"
+#include "base/path_service.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
 #include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/path_x11.h"
 #include "ui/gfx/x/x11_atom_cache.h"
+#include "ui/gl/gl_surface.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/x11_property_change_waiter.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
@@ skipping 149 matching lines @@
       int screen_x,
       int screen_y,
       aura::Window* ignore_window) {
     std::set<aura::Window*> ignore;
     ignore.insert(ignore_window);
     X11TopmostWindowFinder finder;
     return finder.FindLocalProcessWindowAt(gfx::Point(screen_x, screen_y),
                                            ignore);
   }
 
+  static void SetUpTestCase() {
+    gfx::GLSurface::InitializeOneOffForTests();
+    ui::RegisterPathProvider();
+    base::FilePath ui_test_pak_path;
+    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+  }
+
   // ViewsTestBase:
   virtual void SetUp() OVERRIDE {
     ViewsTestBase::SetUp();
 
     // Make X11 synchronous for our display connection. This does not force the
     // window manager to behave synchronously.
     XSynchronize(xdisplay(), True);
 
     // Ensure that the X11DesktopHandler exists. The X11DesktopHandler is
     // necessary to properly track menu windows.
     X11DesktopHandler::get();
   }
 
   virtual void TearDown() OVERRIDE {
     XSynchronize(xdisplay(), False);
     ViewsTestBase::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(X11TopmostWindowFinderTest);
 };
 
-// Flaky on Linux.  http://crbug.com/388241
-TEST_F(X11TopmostWindowFinderTest, DISABLED_Basic) {
+TEST_F(X11TopmostWindowFinderTest, Basic) {
   // Avoid positioning test windows at 0x0 because window managers often have a
   // panel/launcher along one of the screen edges and do not allow windows to
   // position themselves to overlap the panel/launcher.
   scoped_ptr<Widget> widget1(
       CreateAndShowWidget(gfx::Rect(100, 100, 200, 100)));
   aura::Window* window1 = widget1->GetNativeWindow();
   XID xid1 = window1->GetHost()->GetAcceleratedWidget();
 
   XID xid2 = CreateAndShowXWindow(gfx::Rect(200, 100, 100, 200));
 
@@ skipping 33 matching lines @@
             FindTopmostLocalProcessWindowWithIgnore(250, 250, window3));
   EXPECT_EQ(NULL,
             FindTopmostLocalProcessWindowWithIgnore(150, 250, window3));
   EXPECT_EQ(window1,
             FindTopmostLocalProcessWindowWithIgnore(150, 195, window3));
 
   XDestroyWindow(xdisplay(), xid2);
 }
 
 // Test that the minimized state is properly handled.
-// Flaky on Linux.  http://crbug.com/388241
-TEST_F(X11TopmostWindowFinderTest, DISABLED_Minimized) {
+TEST_F(X11TopmostWindowFinderTest, Minimized) {
   scoped_ptr<Widget> widget1(
       CreateAndShowWidget(gfx::Rect(100, 100, 100, 100)));
   aura::Window* window1 = widget1->GetNativeWindow();
   XID xid1 = window1->GetHost()->GetAcceleratedWidget();
   XID xid2 = CreateAndShowXWindow(gfx::Rect(300, 100, 100, 100));
 
   XID xids[] = { xid1, xid2 };
   StackingClientListWaiter stack_waiter(xids, arraysize(xids));
   stack_waiter.Wait();
   ui::X11EventSource::GetInstance()->DispatchXEvents();
@@ skipping 15 matching lines @@
     XIconifyWindow(xdisplay(), xid2, 0);
     minimize_waiter.Wait();
   }
   EXPECT_NE(xid1, FindTopmostXWindowAt(350, 150));
   EXPECT_NE(xid2, FindTopmostXWindowAt(350, 150));
 
   XDestroyWindow(xdisplay(), xid2);
 }
 
 // Test that non-rectangular windows are properly handled.
-// Flaky on Linux.  http://crbug.com/388241
-TEST_F(X11TopmostWindowFinderTest, DISABLED_NonRectangular) {
+TEST_F(X11TopmostWindowFinderTest, NonRectangular) {
   if (!ui::IsShapeExtensionAvailable())
     return;
 
   scoped_ptr<Widget> widget1(
       CreateAndShowWidget(gfx::Rect(100, 100, 100, 100)));
   XID xid1 = widget1->GetNativeWindow()->GetHost()->GetAcceleratedWidget();
   SkRegion* skregion1 = new SkRegion;
   skregion1->op(SkIRect::MakeXYWH(0, 10, 10, 90), SkRegion::kUnion_Op);
   skregion1->op(SkIRect::MakeXYWH(10, 0, 90, 100), SkRegion::kUnion_Op);
   // Widget takes ownership of |skregion1|.
@@ skipping 21 matching lines @@
   // because the code path is different.
   EXPECT_EQ(xid2, FindTopmostXWindowAt(305, 120));
   EXPECT_NE(xid1, FindTopmostXWindowAt(305, 105));
   EXPECT_NE(xid2, FindTopmostXWindowAt(305, 105));
 
   XDestroyWindow(xdisplay(), xid2);
 }
 
 // Test that the TopmostWindowFinder finds windows which belong to menus
 // (which may or may not belong to Chrome).
-// Flaky on Linux.  http://crbug.com/388241
-TEST_F(X11TopmostWindowFinderTest, DISABLED_Menu) {
+TEST_F(X11TopmostWindowFinderTest, Menu) {
   XID xid = CreateAndShowXWindow(gfx::Rect(100, 100, 100, 100));
 
   XID root = DefaultRootWindow(xdisplay());
   XSetWindowAttributes swa;
   swa.override_redirect = True;
   XID menu_xid = XCreateWindow(xdisplay(),
                                root,
                                0, 0, 1, 1,
                                0,                  // border width
                                CopyFromParent,     // depth
@@ skipping 20 matching lines @@
 
   EXPECT_EQ(xid, FindTopmostXWindowAt(110, 110));
   EXPECT_EQ(menu_xid, FindTopmostXWindowAt(150, 120));
   EXPECT_EQ(menu_xid, FindTopmostXWindowAt(210, 120));
 
   XDestroyWindow(xdisplay(), xid);
   XDestroyWindow(xdisplay(), menu_xid);
 }
 
 }  // namespace views