| Index: Source/web/tests/PageSerializerTest.cpp
|
| diff --git a/Source/web/tests/PageSerializerTest.cpp b/Source/web/tests/PageSerializerTest.cpp
|
| index 99c91fe827f64f409e5184ce8869d36aee519842..7b0f0c198195b57ca4d178f38fc8831e232ca738 100644
|
| --- a/Source/web/tests/PageSerializerTest.cpp
|
| +++ b/Source/web/tests/PageSerializerTest.cpp
|
| @@ -50,7 +50,6 @@
|
|
|
| using namespace WebCore;
|
| using namespace blink;
|
| -using blink::FrameTestHelpers::runPendingTasks;
|
| using blink::URLTestHelpers::toKURL;
|
| using blink::URLTestHelpers::registerMockedURLLoad;
|
|
|
| @@ -107,17 +106,7 @@ protected:
|
|
|
| void serialize(const char* url)
|
| {
|
| - 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();
|
| -
|
| + FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(), KURL(m_baseUrl, url).string().utf8().data());
|
| PageSerializer serializer(&m_resources);
|
| serializer.serialize(m_helper.webViewImpl()->mainFrameImpl()->frame()->page());
|
| }
|
|
|