tests: Use runPendingTasks instead of WebThread::enterRunLoop()/exitRunLoop()

Source/web/tests/FrameTestHelpers.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "web/tests/FrameTestHelpers.h"
 
 #include "core/testing/URLTestHelpers.h"
+#include "core/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
@@ skipping 17 matching lines @@
 // 5. While ServeAsyncRequestsTask observes TestWebFrameClient to still have
 //    loads in progress, it posts itself back to the run loop.
 // 6. When ServeAsyncRequestsTask notices there are no more loads in progress,
 //    it exits the run loop.
 // 7. At this point, all parsing, resource loads, and layout should be finished.
 TestWebFrameClient* testClientForFrame(WebFrame* frame)
 {
     return static_cast<TestWebFrameClient*>(toWebLocalFrameImpl(frame)->client());
 }
 
-class QuitTask : public WebThread::Task {
-public:
-    void PostThis(Timer<QuitTask>*)
-    {
-        // We don't just quit here because the SharedTimer may be part-way
-        // through the current queue of tasks when runPendingTasks was called,
-        // and we can't miss the tasks that were behind it.
-        // Takes ownership of |this|.
-        Platform::current()->currentThread()->postTask(FROM_HERE, this);
-    }
-
-    virtual void run()
-    {
-        Platform::current()->currentThread()->exitRunLoop();
-    }
-};
-
 class ServeAsyncRequestsTask : public WebThread::Task {
 public:
     explicit ServeAsyncRequestsTask(TestWebFrameClient* client)
         : m_client(client)
     {
     }
 
     virtual void run() override
     {
         Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
@@ skipping 137 matching lines @@
 {
     Platform::current()->currentThread()->postTask(FROM_HERE, new ReloadTask(frame, true));
     pumpPendingRequests(frame);
 }
 
 void pumpPendingRequestsDoNotUse(WebFrame* frame)
 {
     pumpPendingRequests(frame);
 }
 
-// FIXME: There's a duplicate implementation in UnitTestHelpers.cpp. Remove one.
-void runPendingTasks()
-{
-    // Pending tasks include Timers that have been scheduled.
-    Timer<QuitTask> quitOnTimeout(new QuitTask, &QuitTask::PostThis);
-    quitOnTimeout.startOneShot(0, FROM_HERE);
-    Platform::current()->currentThread()->enterRunLoop();
-}
-
 WebViewHelper::WebViewHelper()
     : m_webView(0)
 {
 }
 
 WebViewHelper::~WebViewHelper()
 {
     reset();
 }
 
@@ skipping 65 matching lines @@
     --m_loadsInProgress;
 }
 
 void TestWebFrameClient::waitForLoadToComplete()
 {
     for (;;) {
         // We call runPendingTasks multiple times as single call of
         // runPendingTasks may not be enough.
         // runPendingTasks only ensures that main thread task queue is empty,
         // and asynchronous parsing make use of off main thread HTML parser.
-        FrameTestHelpers::runPendingTasks();
+        testing::runPendingTasks();
         if (!isLoading())
             break;
 
         Platform::current()->yieldCurrentThread();
     }
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting());
     ASSERT(m_layerTreeView);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink