diff options
Diffstat (limited to 'Source/WebKit/chromium/tests/WebPageSerializerTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/WebPageSerializerTest.cpp | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp b/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp index aa0c6dc2a..feb5f7f6f 100644 --- a/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp +++ b/Source/WebKit/chromium/tests/WebPageSerializerTest.cpp @@ -31,6 +31,7 @@ #include "config.h" #include "WebPageSerializer.h" +#include "URLTestHelpers.h" #include "WebFrame.h" #include "WebFrameClient.h" #include "platform/WebString.h" @@ -39,11 +40,11 @@ #include "platform/WebURLResponse.h" #include "WebView.h" -#include <googleurl/src/gurl.h> #include <gtest/gtest.h> #include <webkit/support/webkit_support.h> using namespace WebKit; +using WebKit::URLTestHelpers::toKURL; namespace { @@ -73,22 +74,16 @@ protected: m_webView->close(); } - void registerMockedURLLoad(const WebURL& url, const WebString& fileName) + void registerMockedURLLoad(const std::string& url, const WebString& fileName) { - WebURLResponse response; - response.initialize(); - response.setMIMEType("text/html"); - std::string filePath = webkit_support::GetWebKitRootDir().utf8(); - filePath.append("/Source/WebKit/chromium/tests/data/pageserialization/"); - filePath.append(fileName.utf8()); - webkit_support::RegisterMockedURL(url, response, WebString::fromUTF8(filePath)); + URLTestHelpers::registerMockedURLLoad(toKURL(url), fileName, WebString::fromUTF8("pageserialization/"), WebString::fromUTF8("text/html")); } - void loadURLInTopFrame(const GURL& url) + void loadURLInTopFrame(const WebURL& url) { WebURLRequest urlRequest; urlRequest.initialize(); - urlRequest.setURL(WebURL(url)); + urlRequest.setURL(url); m_webView->mainFrame()->loadRequest(urlRequest); // Make sure any pending request get served. webkit_support::ServeAsynchronousMockedRequests(); @@ -96,7 +91,7 @@ protected: static bool webVectorContains(const WebVector<WebURL>& vector, const char* url) { - return vector.contains(WebURL(GURL(url))); + return vector.contains(WebURL(toKURL(std::string(url)))); } // Useful for debugging. @@ -116,8 +111,8 @@ private: TEST_F(WebPageSerializerTest, HTMLNodes) { // Register the mocked frame and load it. - WebURL topFrameURL = GURL("http://www.test.com"); - registerMockedURLLoad(topFrameURL, WebString::fromUTF8("simple_page.html")); + WebURL topFrameURL = toKURL("http://www.test.com"); + registerMockedURLLoad("http://www.test.com", WebString::fromUTF8("simple_page.html")); loadURLInTopFrame(topFrameURL); // Retrieve all resources. @@ -150,18 +145,18 @@ TEST_F(WebPageSerializerTest, HTMLNodes) TEST_F(WebPageSerializerTest, MultipleFrames) { // Register the mocked frames. - WebURL topFrameURL = GURL("http://www.test.com"); - registerMockedURLLoad(topFrameURL, WebString::fromUTF8("top_frame.html")); - registerMockedURLLoad(GURL("http://www.test.com/simple_iframe.html"), + WebURL topFrameURL = toKURL("http://www.test.com"); + registerMockedURLLoad("http://www.test.com", WebString::fromUTF8("top_frame.html")); + registerMockedURLLoad("http://www.test.com/simple_iframe.html", WebString::fromUTF8("simple_iframe.html")); - registerMockedURLLoad(GURL("http://www.test.com/object_iframe.html"), + registerMockedURLLoad("http://www.test.com/object_iframe.html", WebString::fromUTF8("object_iframe.html")); - registerMockedURLLoad(GURL("http://www.test.com/embed_iframe.html"), + registerMockedURLLoad("http://www.test.com/embed_iframe.html", WebString::fromUTF8("embed_iframe.html")); // If we don't register a mocked resource for awesome.png, it causes the // document loader of the iframe that has it as its src to assert on close, // not sure why. - registerMockedURLLoad(GURL("http://www.test.com/awesome.png"), + registerMockedURLLoad("http://www.test.com/awesome.png", WebString::fromUTF8("awesome.png")); loadURLInTopFrame(topFrameURL); |