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

content/shell/renderer/layout_test/blink_test_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <clocale>
 #include <cmath>
@@ skipping 12 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #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"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/media_stream_api.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
@@ skipping 62 matching lines @@
 using blink::WebTestingSupport;
 using blink::WebTraceLocation;
 using blink::WebThread;
 using blink::WebVector;
 using blink::WebView;
 
 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() {}
   ~SyncNavigationStateVisitor() override {}
 
   bool Visit(RenderView* render_view) override {
     SyncNavigationState(render_view);
     return true;
   }
  private:
@@ skipping 144 matching lines @@
 
 void BlinkTestRunner::SetDeviceOrientationData(
     const WebDeviceOrientationData& data) {
   SetMockDeviceOrientationData(data);
 }
 
 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(
     const blink::WebVector<blink::WebString>& absolute_filenames) {
   std::vector<base::FilePath> files;
   for (size_t i = 0; i < absolute_filenames.size(); ++i)
     files.push_back(blink::WebStringToFilePath(absolute_filenames[i]));
   std::string filesystem_id;
   Send(new LayoutTestHostMsg_RegisterIsolatedFileSystem(
       routing_id(), files, &filesystem_id));
@@ skipping 712 matching lines @@
   get_bluetooth_events_callbacks_.pop_front();
   callback.Run(events);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content