Revert of Fix webkit_unit_tests to use the threaded parser and enable everywhere.

Source/web/tests/WebPageNewSerializerTest.cpp

 /*
  * Copyright (C) 2011 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 141 matching lines @@
         registerMockedURLLoad(toKURL("http://www.test.com/green_background.png"), WebString::fromUTF8("green_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/blue_background.png"), WebString::fromUTF8("blue_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/purple_background.png"), WebString::fromUTF8("purple_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/ul-dot.png"), WebString::fromUTF8("ul-dot.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/ol-dot.png"), WebString::fromUTF8("ol-dot.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
         return topFrameURL;
     }
 
     void loadURLInTopFrame(const WebURL& url)
     {
-        FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(), url.string().utf8());
+        WebURLRequest urlRequest;
+        urlRequest.initialize();
+        urlRequest.setURL(url);
+        m_helper.webView()->mainFrame()->loadRequest(urlRequest);
+        // Make sure any pending request get served.
+        Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+        // Some requests get delayed, run the timer.
+        runPendingTasks();
+        // Server the delayed resources.
+        Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     }
 
     const WebString& htmlMimeType() const { return m_htmlMimeType; }
     const WebString& xhtmlMimeType() const { return m_xhtmlMimeType; }
     const WebString& cssMimeType() const { return m_cssMimeType; }
     const WebString& pngMimeType() const { return m_pngMimeType; }
     const WebString& svgMimeType() const { return m_svgMimeType; }
 
     static bool resourceVectorContains(const WebVector<WebPageSerializer::Resource>& resources, const char* url, const char* mimeType)
     {
@@ skipping 30 matching lines @@
     // Register the mocked frames.
     WebURL topFrameURL = toKURL("http://www.test.com");
     registerMockedURLLoad(topFrameURL, WebString::fromUTF8("top_frame.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toKURL("http://www.test.com/iframe.html"), WebString::fromUTF8("iframe.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toKURL("http://www.test.com/iframe2.html"), WebString::fromUTF8("iframe2.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toKURL("http://www.test.com/red_background.png"), WebString::fromUTF8("red_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
     registerMockedURLLoad(toKURL("http://www.test.com/green_background.png"), WebString::fromUTF8("green_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
     registerMockedURLLoad(toKURL("http://www.test.com/blue_background.png"), WebString::fromUTF8("blue_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
 
     loadURLInTopFrame(topFrameURL);
+    // OBJECT/EMBED have some delay to start to load their content. The first
+    // serveAsynchronousMockedRequests call in loadURLInTopFrame() finishes
+    // before the start.
+    RefPtrWillBeRawPtr<Document> document = static_cast<PassRefPtrWillBeRawPtr<Document> >(webView()->mainFrame()->document());
+    document->updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
+    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
 
     WebVector<WebPageSerializer::Resource> resources;
     WebPageSerializer::serialize(webView(), &resources);
     ASSERT_FALSE(resources.isEmpty());
 
     // The first resource should be the main-frame.
     const WebPageSerializer::Resource& resource = resources[0];
     EXPECT_TRUE(resource.url == WebURL(toKURL("http://www.test.com")));
     EXPECT_EQ(0, resource.mimeType.compare(WebCString("text/html")));
     EXPECT_FALSE(resource.data.isEmpty());
@@ skipping 273 matching lines @@
     // exactly two times.
     size_t nbDataURLs = 0;
     LineReader lineReader(std::string(mhtmlData.data()));
     std::string line;
     while (lineReader.getNextLine(&line)) {
         if (line.find("data:text") != std::string::npos)
             nbDataURLs++;
     }
     EXPECT_EQ(2u, nbDataURLs);
 }