| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index 2b0965ea90adf4a8d217361aa30c9f75d9ffc256..3a0eb018b66b684a764fb3f4630d1fe4a331547b 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -117,6 +117,7 @@ namespace {
|
|
|
| using blink::URLTestHelpers::toKURL;
|
| using blink::FrameTestHelpers::runPendingTasks;
|
| +using blink::FrameTestHelpers::UseMockScrollbarSettings;
|
| using namespace blink;
|
|
|
| const int touchPointPadding = 32;
|
| @@ -238,22 +239,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);
|
| - }
|
| -};
|
| -
|
| TEST_F(WebFrameTest, ContentText)
|
| {
|
| registerMockedHttpURLLoad("iframes_test.html");
|
|
|