Made top controls work with virtual viewport pinch-to-zoom. (Blink)

Source/web/tests/ViewportTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 40 matching lines @@
 #include "public/web/WebViewClient.h"
 #include "web/tests/FrameTestHelpers.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <vector>
 
 namespace {
 
 using blink::FrameTestHelpers::runPendingTasks;
+using blink::FrameTestHelpers::UseMockScrollbarSettings;
 using namespace blink;
 
 class ViewportTest : public testing::Test {
 protected:
     ViewportTest()
         : m_baseURL("http://www.test.com/")
         , m_chromeURL("chrome://")
     {
     }
 
@@ skipping 15 matching lines @@
     void executeScript(WebFrame* frame, const WebString& code)
     {
         frame->executeScript(WebScriptSource(code));
         runPendingTasks();
     }
 
     std::string m_baseURL;
     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);
     settings->setViewportMetaEnabled(true);
     settings->setMainFrameResizesAreOrientationChanges(true);
 }
 
 static PageScaleConstraints runViewportTest(Page* page, int initialWidth, int initialHeight)
 {
     IntSize initialViewportSize(initialWidth, initialHeight);
@@ skipping 3043 matching lines @@
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-7.html", true, &webFrameClient, 0, setViewportSettings);
 
     Page* page = webViewHelper.webViewImpl()->page();
     runViewportTest(page, 320, 352);
 
     EXPECT_EQ(0U, webFrameClient.messages.size());
 }
 
 } // namespace