| Index: Source/web/tests/PopupMenuTest.cpp
|
| diff --git a/Source/web/tests/PopupMenuTest.cpp b/Source/web/tests/PopupMenuTest.cpp
|
| index 289aa79cebd761289d824d522ef6e5b96faf3022..df5d615d406639ff46c46d5f51e1cb42e0f023d3 100644
|
| --- a/Source/web/tests/PopupMenuTest.cpp
|
| +++ b/Source/web/tests/PopupMenuTest.cpp
|
| @@ -250,17 +250,9 @@ protected:
|
| 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)
|
| {
|
| - WebURLRequest urlRequest;
|
| - urlRequest.initialize();
|
| - urlRequest.setURL(WebURL(toKURL(baseURL + fileName)));
|
| - frame->loadRequest(urlRequest);
|
| + FrameTestHelpers::loadFrame(frame, baseURL + fileName);
|
| }
|
|
|
| WebViewImpl* webView() const { return m_helper.webViewImpl(); }
|
| @@ -405,7 +397,6 @@ TEST_F(SelectPopupMenuTest, DISABLED_SelectItemEventFire)
|
| registerMockedURLLoad("select_event.html");
|
| webView()->settings()->setJavaScriptEnabled(true);
|
| loadFrame(mainFrame(), "select_event.html");
|
| - serveRequests();
|
|
|
| m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement());
|
|
|
| @@ -450,7 +441,6 @@ TEST_F(SelectPopupMenuTest, FLAKY_SelectItemKeyEvent)
|
| registerMockedURLLoad("select_event.html");
|
| webView()->settings()->setJavaScriptEnabled(true);
|
| loadFrame(mainFrame(), "select_event.html");
|
| - serveRequests();
|
|
|
| m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement());
|
|
|
| @@ -472,7 +462,6 @@ TEST_F(SelectPopupMenuTest, SelectItemRemoveSelectOnChange)
|
| 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());
|
|
|
| @@ -494,7 +483,6 @@ TEST_F(SelectPopupMenuTest, SelectItemRemoveSelectOnClick)
|
| 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());
|
|
|
|
|