Clean up WebTaskRunner::Task subclasses in web/tests/

third_party/WebKit/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 27 matching lines @@
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebFrameWidget.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebTreeScopeType.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
+#include "wtf/Functional.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 namespace FrameTestHelpers {
 
 namespace {
 
 // The frame test helpers coordinate frame loads in a carefully choreographed
 // dance. Since the parser is threaded, simply spinning the run loop once is not
 // enough to ensure completion of a load. Instead, the following pattern is
 // used to ensure that tests see the final state:
 // 1. Starts a load.
 // 2. Enter the run loop.
 // 3. Posted task triggers the load, and starts pumping pending resource
-//    requests using ServeAsyncRequestsTask.
+//    requests using runServeAsyncRequestsTask().
 // 4. TestWebFrameClient watches for didStartLoading/didStopLoading calls,
 //    keeping track of how many loads it thinks are in flight.
-// 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.
+// 5. While runServeAsyncRequestsTask() observes TestWebFrameClient to still
+//    have loads in progress, it posts itself back to the run loop.
+// 6. When runServeAsyncRequestsTask() 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 ServeAsyncRequestsTask : public WebTaskRunner::Task {
-public:
-    explicit ServeAsyncRequestsTask(TestWebFrameClient* client)
-        : m_client(client)
-    {
-    }
-
-    void run() override
-    {
-        Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
-        if (m_client->isLoading())
-            Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, new ServeAsyncRequestsTask(m_client));
-        else
-            testing::exitRunLoop();
-    }
-
-private:
-    TestWebFrameClient* const m_client;
-};
+void runServeAsyncRequestsTask(TestWebFrameClient* client)
+{
+    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+    if (client->isLoading())
+        Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&runServeAsyncRequestsTask, client));
+    else
+        testing::exitRunLoop();
+}
 
 void pumpPendingRequests(WebFrame* frame)
 {
-    Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, new ServeAsyncRequestsTask(testClientForFrame(frame)));
+    Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&runServeAsyncRequestsTask, testClientForFrame(frame)));
     testing::enterRunLoop();
 }
 
 TestWebFrameClient* defaultWebFrameClient()
 {
     DEFINE_STATIC_LOCAL(TestWebFrameClient, client, ());
     return &client;
 }
 
 TestWebViewClient* defaultWebViewClient()
@@ skipping 178 matching lines @@
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting());
     ASSERT(m_layerTreeView);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink