Fix webkit_unit_tests to use the threaded parser and enable everywhere.

Source/web/tests/PinchViewportTest.cpp

 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/frame/PinchViewport.h"
 
 #include "core/frame/FrameHost.h"
@@ skipping 41 matching lines @@
     do { \
         EXPECT_FLOAT_EQ((expected).x(), (actual).x()); \
         EXPECT_FLOAT_EQ((expected).y(), (actual).y()); \
         EXPECT_FLOAT_EQ((expected).width(), (actual).width()); \
         EXPECT_FLOAT_EQ((expected).height(), (actual).height()); \
     } while (false)
 
 
 using namespace WebCore;
 using namespace blink;
-using blink::FrameTestHelpers::runPendingTasks;
 
 namespace {
 
 class PinchViewportTest : public testing::Test {
 public:
     PinchViewportTest()
         : m_baseURL("http://www.test.com/")
     {
     }
 
@@ skipping 10 matching lines @@
     }
 
     virtual ~PinchViewportTest()
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
     }
 
     void navigateTo(const std::string& url)
     {
         FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url);
-        Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     }
 
     void forceFullCompositingUpdate()
     {
         webViewImpl()->layout();
     }
 
     void registerMockedHttpURLLoad(const std::string& fileName)
     {
         URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(fileName.c_str()));
     }
 
-    void executeScript(const WebString& code)
-    {
-        webViewImpl()->mainFrame()->executeScript(WebScriptSource(code));
-        runPendingTasks();
-    }
-
     WebLayer* getRootScrollLayer()
     {
         RenderLayerCompositor* compositor = frame()->contentRenderer()->compositor();
         ASSERT(compositor);
         ASSERT(compositor->scrollLayer());
 
         WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer();
         return webScrollLayer;
     }
 
@@ skipping 395 matching lines @@
 
     registerMockedHttpURLLoad("200-by-300.html");
 
     WebHistoryItem item;
     item.initialize();
     WebURL destinationURL(blink::URLTestHelpers::toKURL(m_baseURL + "200-by-300.html"));
     item.setURLString(destinationURL.string());
     item.setPinchViewportScrollOffset(WebFloatPoint(100, 120));
     item.setPageScaleFactor(2);
 
-    webViewImpl()->mainFrame()->loadHistoryItem(item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+    FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     EXPECT_EQ(2, pinchViewport.scale());
 
     EXPECT_FLOAT_POINT_EQ(FloatPoint(100, 120), pinchViewport.visibleRect().location());
 }
 
 // Test restoring a HistoryItem without the pinch viewport offset falls back to distributing
 // the scroll offset between the main frame and the pinch viewport.
 TEST_F(PinchViewportTest, TestRestoredFromLegacyHistoryItem)
 {
     initializeWithDesktopSettings();
     webViewImpl()->resize(IntSize(100, 150));
 
     registerMockedHttpURLLoad("200-by-300-viewport.html");
 
     WebHistoryItem item;
     item.initialize();
     WebURL destinationURL(blink::URLTestHelpers::toKURL(m_baseURL + "200-by-300-viewport.html"));
     item.setURLString(destinationURL.string());
     // (-1, -1) will be used if the HistoryItem is an older version prior to having
     // pinch viewport scroll offset.
     item.setPinchViewportScrollOffset(WebFloatPoint(-1, -1));
     item.setScrollOffset(WebPoint(120, 180));
     item.setPageScaleFactor(2);
 
-    webViewImpl()->mainFrame()->loadHistoryItem(item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+    FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     EXPECT_EQ(2, pinchViewport.scale());
     EXPECT_POINT_EQ(IntPoint(100, 150), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(20, 30), pinchViewport.visibleRect().location());
 }
 
 } // namespace