Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / tests / PageSerializerTest.cpp

diff --git a/src/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp b/src/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp
index 667ae77..b89faa6 100644 (file)
--- a/src/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp
+++ b/src/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp
@@ -30,12 +30,6 @@
 
 #include "config.h"
 
-#include "FrameTestHelpers.h"
-#include "URLTestHelpers.h"
-#include "WebFrameImpl.h"
-#include "WebSettings.h"
-#include "WebViewImpl.h"
-#include <gtest/gtest.h>
 #include "core/page/Page.h"
 #include "core/page/PageSerializer.h"
 #include "platform/SerializedResource.h"
@@ -46,11 +40,16 @@
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
+#include "public/web/WebSettings.h"
+#include "web/WebLocalFrameImpl.h"
+#include "web/WebViewImpl.h"
+#include "web/tests/FrameTestHelpers.h"
+#include "web/tests/URLTestHelpers.h"
 #include "wtf/Vector.h"
+#include <gtest/gtest.h>
 
-using namespace WebCore;
 using namespace blink;
-using blink::FrameTestHelpers::runPendingTasks;
+using namespace blink;
 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());
     }