Remove WebCallbackTask

components/test_runner/mock_web_user_media_client.cc

 // Copyright 2014 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 "components/test_runner/mock_web_user_media_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaDeviceInfo.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h"
 #include "third_party/WebKit/public/platform/WebSourceInfo.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ skipping 23 matching lines @@
       weak_factory_(this) {}
 
 MockWebUserMediaClient::~MockWebUserMediaClient() {}
 
 void MockWebUserMediaClient::requestUserMedia(
     const WebUserMediaRequest& stream_request) {
     DCHECK(!stream_request.isNull());
     WebUserMediaRequest request = stream_request;
 
     if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
-      delegate_->PostTask(new WebCallbackTask(base::Bind(
+      delegate_->PostTask(base::Bind(
           &WebUserMediaRequest::requestFailed,
-          base::Owned(new WebUserMediaRequest(request)), WebString())));
+          base::Owned(new WebUserMediaRequest(request)), WebString()));
       return;
     }
 
     WebMediaStream stream;
     stream.initialize(WebVector<WebMediaStreamTrack>(),
                       WebVector<WebMediaStreamTrack>());
     stream.setExtraData(new MockExtraData());
 
     if (request.audio() &&
         !delegate_->AddMediaStreamAudioSourceAndTrack(&stream)) {
@@ skipping 12 matching lines @@
       WebMediaStreamSource source;
       source.initialize("MockVideoDevice#1",
                         WebMediaStreamSource::TypeVideo,
                         "Mock video device",
                         false /* remote */);
       WebMediaStreamTrack web_track;
       web_track.initialize(source);
       stream.addTrack(web_track);
     }
 
-    delegate_->PostTask(new WebCallbackTask(
+    delegate_->PostTask(
         base::Bind(&WebUserMediaRequest::requestSucceeded,
-                   base::Owned(new WebUserMediaRequest(request)), stream)));
+                   base::Owned(new WebUserMediaRequest(request)), stream));
 }
 
 void MockWebUserMediaClient::cancelUserMediaRequest(
     const WebUserMediaRequest&) {
 }
 
 void MockWebUserMediaClient::requestMediaDevices(
     const WebMediaDevicesRequest& request) {
   struct {
     const char* device_id;
@@ skipping 31 matching lines @@
                            ? arraysize(test_devices)
                            : arraysize(test_devices) - 1;
   WebVector<WebMediaDeviceInfo> devices(num_devices);
   for (size_t i = 0; i < num_devices; ++i) {
     devices[i].initialize(WebString::fromUTF8(test_devices[i].device_id),
                           test_devices[i].kind,
                           WebString::fromUTF8(test_devices[i].label),
                           WebString::fromUTF8(test_devices[i].group_id));
   }
 
-  delegate_->PostTask(new WebCallbackTask(
+  delegate_->PostTask(
       base::Bind(&WebMediaDevicesRequest::requestSucceeded,
-                 base::Owned(new WebMediaDevicesRequest(request)), devices)));
+                 base::Owned(new WebMediaDevicesRequest(request)), devices));
 
   should_enumerate_extra_device_ = !should_enumerate_extra_device_;
   if (!media_device_change_observer_.isNull())
     media_device_change_observer_.didChangeMediaDevices();
 }
 
 void MockWebUserMediaClient::cancelMediaDevicesRequest(
     const WebMediaDevicesRequest&) {
 }
 
@@ skipping 20 matching lines @@
   };
 
   WebVector<WebSourceInfo> sources(arraysize(test_sources));
   for (size_t i = 0; i < arraysize(test_sources); ++i) {
   sources[i].initialize(WebString::fromUTF8(test_sources[i].id),
                         test_sources[i].kind,
                         WebString::fromUTF8(test_sources[i].label),
                         test_sources[i].facing);
   }
 
-  delegate_->PostTask(new WebCallbackTask(base::Bind(
+  delegate_->PostTask(base::Bind(
       &WebMediaStreamTrackSourcesRequest::requestSucceeded,
-      base::Owned(new WebMediaStreamTrackSourcesRequest(request)), sources)));
+      base::Owned(new WebMediaStreamTrackSourcesRequest(request)), sources));
 }
 
 void MockWebUserMediaClient::setMediaDeviceChangeObserver(
     const blink::WebMediaDeviceChangeObserver& observer) {
   media_device_change_observer_ = observer;
 }
 
 }  // namespace test_runner