Introduce WebTaskRunner Patch 3/5

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 54 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 ServeAsyncRequestsTask : public WebThread::Task {
+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()->postTask(FROM_HERE, new ServeAsyncRequestsTask(m_client));
+            Platform::current()->currentThread()->taskRunner()->postTask(FROM_HERE, new ServeAsyncRequestsTask(m_client));
         else
             Platform::current()->unitTestSupport()->exitRunLoop();
     }
 
 private:
     TestWebFrameClient* const m_client;
 };
 
 void pumpPendingRequests(WebFrame* frame)
 {
-    Platform::current()->currentThread()->postTask(FROM_HERE, new ServeAsyncRequestsTask(testClientForFrame(frame)));
+    Platform::current()->currentThread()->taskRunner()->postTask(FROM_HERE, new ServeAsyncRequestsTask(testClientForFrame(frame)));
     Platform::current()->unitTestSupport()->enterRunLoop();
 }
 
-class LoadTask : public WebThread::Task {
+class LoadTask : public WebTaskRunner::Task {
 public:
     LoadTask(WebFrame* frame, const WebURLRequest& request)
         : m_frame(frame)
         , m_request(request)
     {
     }
 
     void run() override
     {
         m_frame->loadRequest(m_request);
     }
 
 private:
     WebFrame* const m_frame;
     const WebURLRequest m_request;
 };
 
-class LoadHTMLStringTask : public WebThread::Task {
+class LoadHTMLStringTask : public WebTaskRunner::Task {
 public:
     LoadHTMLStringTask(WebFrame* frame, const std::string& html, const WebURL& baseURL)
         : m_frame(frame)
         , m_html(html)
         , m_baseURL(baseURL)
     {
     }
 
     void run() override
     {
         m_frame->loadHTMLString(WebData(m_html.data(), m_html.size()), m_baseURL);
     }
 
 private:
     WebFrame* const m_frame;
     const std::string m_html;
     const WebURL m_baseURL;
 };
 
-class LoadHistoryItemTask : public WebThread::Task {
+class LoadHistoryItemTask : public WebTaskRunner::Task {
 public:
     LoadHistoryItemTask(WebFrame* frame, const WebHistoryItem& item, WebHistoryLoadType loadType, WebURLRequest::CachePolicy cachePolicy)
         : m_frame(frame)
         , m_item(item)
         , m_loadType(loadType)
         , m_cachePolicy(cachePolicy)
     {
     }
 
     void run() override
     {
         m_frame->loadHistoryItem(m_item, m_loadType, m_cachePolicy);
     }
 
 private:
     WebFrame* const m_frame;
     const WebHistoryItem m_item;
     const WebHistoryLoadType m_loadType;
     const WebURLRequest::CachePolicy m_cachePolicy;
 };
 
-class ReloadTask : public WebThread::Task {
+class ReloadTask : public WebTaskRunner::Task {
 public:
     ReloadTask(WebFrame* frame, bool ignoreCache)
         : m_frame(frame)
         , m_ignoreCache(ignoreCache)
     {
     }
 
     void run() override
     {
         m_frame->reload(m_ignoreCache);
@@ skipping 17 matching lines @@
 }
 
 } // namespace
 
 void loadFrame(WebFrame* frame, const std::string& url)
 {
     WebURLRequest urlRequest;
     urlRequest.initialize();
     urlRequest.setURL(URLTestHelpers::toKURL(url));
 
-    Platform::current()->currentThread()->postTask(FROM_HERE, new LoadTask(frame, urlRequest));
+    Platform::current()->currentThread()->taskRunner()->postTask(FROM_HERE, new LoadTask(frame, urlRequest));
     pumpPendingRequests(frame);
 }
 
 void loadHTMLString(WebFrame* frame, const std::string& html, const WebURL& baseURL)
 {
-    Platform::current()->currentThread()->postTask(FROM_HERE, new LoadHTMLStringTask(frame, html, baseURL));
+    Platform::current()->currentThread()->taskRunner()->postTask(FROM_HERE, new LoadHTMLStringTask(frame, html, baseURL));
     pumpPendingRequests(frame);
 }
 
 void loadHistoryItem(WebFrame* frame, const WebHistoryItem& item, WebHistoryLoadType loadType, WebURLRequest::CachePolicy cachePolicy)
 {
-    Platform::current()->currentThread()->postTask(FROM_HERE, new LoadHistoryItemTask(frame, item, loadType, cachePolicy));
+    Platform::current()->currentThread()->taskRunner()->postTask(FROM_HERE, new LoadHistoryItemTask(frame, item, loadType, cachePolicy));
     pumpPendingRequests(frame);
 }
 
 void reloadFrame(WebFrame* frame)
 {
-    Platform::current()->currentThread()->postTask(FROM_HERE, new ReloadTask(frame, false));
+    Platform::current()->currentThread()->taskRunner()->postTask(FROM_HERE, new ReloadTask(frame, false));
     pumpPendingRequests(frame);
 }
 
 void reloadFrameIgnoringCache(WebFrame* frame)
 {
-    Platform::current()->currentThread()->postTask(FROM_HERE, new ReloadTask(frame, true));
+    Platform::current()->currentThread()->taskRunner()->postTask(FROM_HERE, new ReloadTask(frame, true));
     pumpPendingRequests(frame);
 }
 
 void pumpPendingRequestsDoNotUse(WebFrame* frame)
 {
     pumpPendingRequests(frame);
 }
 
 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider)
     : m_webView(0)
@@ skipping 105 matching lines @@
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting());
     ASSERT(m_layerTreeView);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink