Index: Source/web/tests/PopupMenuTest.cpp |
diff --git a/Source/web/tests/PopupMenuTest.cpp b/Source/web/tests/PopupMenuTest.cpp |
index df5d615d406639ff46c46d5f51e1cb42e0f023d3..289aa79cebd761289d824d522ef6e5b96faf3022 100644 |
--- a/Source/web/tests/PopupMenuTest.cpp |
+++ b/Source/web/tests/PopupMenuTest.cpp |
@@ -250,9 +250,17 @@ |
URLTestHelpers::registerMockedURLLoad(toKURL(baseURL + fileName), WebString::fromUTF8(fileName.c_str()), WebString::fromUTF8("popup/"), WebString::fromUTF8("text/html")); |
} |
+ void serveRequests() |
+ { |
+ Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); |
+ } |
+ |
void loadFrame(WebFrame* frame, const std::string& fileName) |
{ |
- FrameTestHelpers::loadFrame(frame, baseURL + fileName); |
+ WebURLRequest urlRequest; |
+ urlRequest.initialize(); |
+ urlRequest.setURL(WebURL(toKURL(baseURL + fileName))); |
+ frame->loadRequest(urlRequest); |
} |
WebViewImpl* webView() const { return m_helper.webViewImpl(); } |
@@ -397,6 +405,7 @@ |
registerMockedURLLoad("select_event.html"); |
webView()->settings()->setJavaScriptEnabled(true); |
loadFrame(mainFrame(), "select_event.html"); |
+ serveRequests(); |
m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement()); |
@@ -441,6 +450,7 @@ |
registerMockedURLLoad("select_event.html"); |
webView()->settings()->setJavaScriptEnabled(true); |
loadFrame(mainFrame(), "select_event.html"); |
+ serveRequests(); |
m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement()); |
@@ -462,6 +472,7 @@ |
registerMockedURLLoad("select_event_remove_on_change.html"); |
webView()->settings()->setJavaScriptEnabled(true); |
loadFrame(mainFrame(), "select_event_remove_on_change.html"); |
+ serveRequests(); |
m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement()); |
@@ -483,6 +494,7 @@ |
registerMockedURLLoad("select_event_remove_on_click.html"); |
webView()->settings()->setJavaScriptEnabled(true); |
loadFrame(mainFrame(), "select_event_remove_on_click.html"); |
+ serveRequests(); |
m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement()); |