| Index: Source/web/tests/ViewportTest.cpp
|
| diff --git a/Source/web/tests/ViewportTest.cpp b/Source/web/tests/ViewportTest.cpp
|
| index 3800cf96e5bfc4a70fba53556d7a116b006b8778..c7ff109f808133885bceafc13fdeb5c3da1db235 100644
|
| --- a/Source/web/tests/ViewportTest.cpp
|
| +++ b/Source/web/tests/ViewportTest.cpp
|
| @@ -58,6 +58,7 @@
|
| namespace {
|
|
|
| using blink::FrameTestHelpers::runPendingTasks;
|
| +using blink::FrameTestHelpers::UseMockScrollbarSettings;
|
| using namespace blink;
|
|
|
| class ViewportTest : public testing::Test {
|
| @@ -93,22 +94,6 @@ protected:
|
| std::string m_chromeURL;
|
| };
|
|
|
| -class UseMockScrollbarSettings {
|
| -public:
|
| - UseMockScrollbarSettings()
|
| - {
|
| - Settings::setMockScrollbarsEnabled(true);
|
| - RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
|
| - EXPECT_TRUE(ScrollbarTheme::theme()->usesOverlayScrollbars());
|
| - }
|
| -
|
| - ~UseMockScrollbarSettings()
|
| - {
|
| - Settings::setMockScrollbarsEnabled(false);
|
| - RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
|
| - }
|
| -};
|
| -
|
| static void setViewportSettings(WebSettings* settings)
|
| {
|
| settings->setViewportEnabled(true);
|
|
|