Index: ui/views/widget/widget_interactive_uitest.cc |
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc |
index 230a720714384882c112f554ef67121b07f8f3a2..1deab16452760b0798a476ac056518630f6b9446 100644 |
--- a/ui/views/widget/widget_interactive_uitest.cc |
+++ b/ui/views/widget/widget_interactive_uitest.cc |
@@ -30,6 +30,7 @@ |
#include "ui/views/focus/focus_manager.h" |
#include "ui/views/test/focus_manager_test.h" |
#include "ui/views/test/native_widget_factory.h" |
+#include "ui/views/test/views_interactive_ui_test_base.h" |
#include "ui/views/test/widget_test.h" |
#include "ui/views/touchui/touch_selection_controller_impl.h" |
#include "ui/views/widget/widget.h" |
@@ -1262,7 +1263,7 @@ class CaptureLostTrackingWidget : public Widget { |
} // namespace |
-class WidgetCaptureTest : public ViewsTestBase { |
+class WidgetCaptureTest : public ViewsInteractiveUITestBase { |
public: |
WidgetCaptureTest() { |
} |
@@ -1272,14 +1273,10 @@ class WidgetCaptureTest : public ViewsTestBase { |
void SetUp() override { |
// On mus these tests run as part of views::ViewsTestSuite which already |
// does this initialization. |
- if (!IsMus()) { |
- 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::SetUp(); |
+ if (!IsMus()) |
+ ViewsInteractiveUITestBase::SetUp(); |
+ else |
+ ViewsTestBase::SetUp(); |
} |
// Verifies Widget::SetCapture() results in updating native capture along with |