Chromium Code Reviews| Index: ui/views/corewm/desktop_capture_controller_unittest.cc |
| diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc |
| index 6df8667421c352bdee2ab593ee43891763264c71..e5f0e1812f68b1879badef64043e88cfd3a0d9df 100644 |
| --- a/ui/views/corewm/desktop_capture_controller_unittest.cc |
| +++ b/ui/views/corewm/desktop_capture_controller_unittest.cc |
| @@ -6,17 +6,13 @@ |
| #include "base/logging.h" |
| #include "base/macros.h" |
| -#include "base/path_service.h" |
| #include "ui/aura/env.h" |
| #include "ui/aura/test/test_window_delegate.h" |
| #include "ui/aura/window_event_dispatcher.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/event.h" |
| #include "ui/events/test/event_generator.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/view.h" |
| #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h" |
| @@ -28,21 +24,7 @@ |
| namespace views { |
| -class DesktopCaptureControllerTest : public ViewsTestBase { |
| - public: |
| - DesktopCaptureControllerTest() {} |
| - ~DesktopCaptureControllerTest() override {} |
| - |
| - void SetUp() override { |
| - 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(); |
| - } |
| -}; |
| +typedef ViewsInteractiveUITestBase DesktopCaptureControllerTest; |
|
sky
2016/10/24 20:05:02
typedef->using
|
| // This class provides functionality to verify whether the View instance |
| // received the gesture event. |