Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1640)

Unified Diff: Source/web/tests/PageSerializerTest.cpp

Issue 272143002: Revert of Fix webkit_unit_tests to use the threaded parser and enable everywhere. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/tests/MHTMLTest.cpp ('k') | Source/web/tests/PinchViewportTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/PageSerializerTest.cpp
diff --git a/Source/web/tests/PageSerializerTest.cpp b/Source/web/tests/PageSerializerTest.cpp
index 7b0f0c198195b57ca4d178f38fc8831e232ca738..99c91fe827f64f409e5184ce8869d36aee519842 100644
--- a/Source/web/tests/PageSerializerTest.cpp
+++ b/Source/web/tests/PageSerializerTest.cpp
@@ -50,6 +50,7 @@
using namespace WebCore;
using namespace blink;
+using blink::FrameTestHelpers::runPendingTasks;
using blink::URLTestHelpers::toKURL;
using blink::URLTestHelpers::registerMockedURLLoad;
@@ -106,7 +107,17 @@
void serialize(const char* url)
{
- FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(), KURL(m_baseUrl, url).string().utf8().data());
+ WebURLRequest urlRequest;
+ urlRequest.initialize();
+ urlRequest.setURL(KURL(m_baseUrl, 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();
+
PageSerializer serializer(&m_resources);
serializer.serialize(m_helper.webViewImpl()->mainFrameImpl()->frame()->page());
}
« no previous file with comments | « Source/web/tests/MHTMLTest.cpp ('k') | Source/web/tests/PinchViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698