Create and apply ViewsInteractiveUITestBase

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 <X11/Xlib.h>
 #include <X11/Xregion.h>
 #include <X11/extensions/shape.h>
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 // Get rid of X11 macros which conflict with gtest.
 #undef Bool
 #undef None
 
 #include "base/macros.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/test/gl_surface_test_support.h"
-#include "ui/views/test/views_test_base.h"
+#include "ui/views/test/views_interactive_ui_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 {
 
 // Waits till |window| is minimized.
@@ skipping 59 matching lines @@
     return false;
   }
 
   std::vector<XID> expected_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(StackingClientListWaiter);
 };
 
 }  // namespace
 
-class X11TopmostWindowFinderTest : public ViewsTestBase {
+class X11TopmostWindowFinderTest : public ViewsInteractiveUITestBase {
  public:
   X11TopmostWindowFinderTest() {
   }
 
   ~X11TopmostWindowFinderTest() override {}
 
   // Creates and shows a Widget with |bounds|. The caller takes ownership of
   // the returned widget.
   std::unique_ptr<Widget> CreateAndShowWidget(const gfx::Rect& bounds) {
     std::unique_ptr<Widget> toplevel(new Widget);
@@ skipping 62 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() {
-    gl::GLSurfaceTestSupport::InitializeOneOff();
-    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:
+  // ViewsInteractiveUITestBase:
   void SetUp() override {
-    ViewsTestBase::SetUp();
+    ViewsInteractiveUITestBase::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();
   }
 
   void TearDown() override {
     XSynchronize(xdisplay(), False);
-    ViewsTestBase::TearDown();
+    ViewsInteractiveUITestBase::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(X11TopmostWindowFinderTest);
 };
 
 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.
@@ skipping 199 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