| Index: third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraTest.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraTest.cpp
|
| index d4601f19e3ada14f1d83441df7b8e58316289237..b8d58e34a909da3544b76bc94f1676ffc0220712 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraTest.cpp
|
| @@ -5,6 +5,7 @@
|
| #include "platform/scroll/ScrollbarThemeAura.h"
|
|
|
| #include "platform/scroll/ScrollbarTestSuite.h"
|
| +#include "platform/testing/TestingPlatformSupport.h"
|
|
|
| namespace blink {
|
|
|
| @@ -28,12 +29,11 @@ class ScrollbarThemeAuraButtonOverride final : public ScrollbarThemeAura {
|
|
|
| } // namespace
|
|
|
| -class ScrollbarThemeAuraTest : public ScrollbarTestSuite {};
|
| +using ScrollbarThemeAuraTest = testing::Test;
|
|
|
| TEST_F(ScrollbarThemeAuraTest, ButtonSizeHorizontal) {
|
| - ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler,
|
| - const TestingPlatformSupport::Config&>
|
| - platform(m_config);
|
| + ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
|
| + platform;
|
|
|
| MockScrollableArea* mockScrollableArea = MockScrollableArea::create();
|
| ScrollbarThemeMock mockTheme;
|
| @@ -57,9 +57,8 @@ TEST_F(ScrollbarThemeAuraTest, ButtonSizeHorizontal) {
|
| }
|
|
|
| TEST_F(ScrollbarThemeAuraTest, ButtonSizeVertical) {
|
| - ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler,
|
| - const TestingPlatformSupport::Config&>
|
| - platform(m_config);
|
| + ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
|
| + platform;
|
|
|
| MockScrollableArea* mockScrollableArea = MockScrollableArea::create();
|
| ScrollbarThemeMock mockTheme;
|
| @@ -83,9 +82,8 @@ TEST_F(ScrollbarThemeAuraTest, ButtonSizeVertical) {
|
| }
|
|
|
| TEST_F(ScrollbarThemeAuraTest, NoButtonsReturnsSize0) {
|
| - ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler,
|
| - const TestingPlatformSupport::Config&>
|
| - platform(m_config);
|
| + ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
|
| + platform;
|
|
|
| MockScrollableArea* mockScrollableArea = MockScrollableArea::create();
|
| ScrollbarThemeMock mockTheme;
|
|
|