Make test_runner::WebTask an internal detail of components/test_runner.

content/shell/renderer/layout_test/blink_test_runner.cc

Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 9d7ba8f7a9767778fd3ea235bb2a5ea3e025290d..29786308425625ed031a97c5940f4aeb184ffe04 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -30,8 +30,6 @@
 #include "build/build_config.h"
 #include "components/plugins/renderer/plugin_placeholder.h"
 #include "components/test_runner/gamepad_controller.h"
-#include "components/test_runner/test_interfaces.h"

[Łukasz Anforowicz, 2016/03/16 01:41:22]

Removing include of test_interfaces.h is not really related to the rest of this
CL... :-)
At any rate - this header is not needed here.

-#include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "components/test_runner/web_test_runner.h"
@@ -114,18 +112,6 @@ namespace content {
 
 namespace {
 
-class InvokeTaskHelper : public blink::WebTaskRunner::Task {
- public:
-  InvokeTaskHelper(scoped_ptr<test_runner::WebTask> task)
-      : task_(std::move(task)) {}
-
-  // WebThread::Task implementation:
-  void run() override { task_->run(); }
-
- private:
-  scoped_ptr<test_runner::WebTask> task_;
-};
-
 class SyncNavigationStateVisitor : public RenderViewVisitor {
  public:
   SyncNavigationStateVisitor() {}
@@ -290,17 +276,15 @@ void BlinkTestRunner::PrintMessage(const std::string& message) {
   Send(new ShellViewHostMsg_PrintMessage(routing_id(), message));
 }
 
-void BlinkTestRunner::PostTask(test_runner::WebTask* task) {
+void BlinkTestRunner::PostTask(blink::WebTaskRunner::Task* task) {
   Platform::current()->currentThread()->getWebTaskRunner()->postTask(
-      WebTraceLocation(__FUNCTION__, __FILE__),
-      new InvokeTaskHelper(make_scoped_ptr(task)));
+      WebTraceLocation(__FUNCTION__, __FILE__), task);
 }
 
-void BlinkTestRunner::PostDelayedTask(test_runner::WebTask* task,
+void BlinkTestRunner::PostDelayedTask(blink::WebTaskRunner::Task* task,
                                       long long ms) {
   Platform::current()->currentThread()->getWebTaskRunner()->postDelayedTask(
-      WebTraceLocation(__FUNCTION__, __FILE__),
-      new InvokeTaskHelper(make_scoped_ptr(task)), ms);
+      WebTraceLocation(__FUNCTION__, __FILE__), task, ms);
 }
 
 WebString BlinkTestRunner::RegisterIsolatedFileSystem(