Commit c63c5a23 authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Move webrtc_media_stream_track_adapter_unittest.cc to Blink

It is now possible after mock_peer_connection_dependency_factory.h|cc
move [1].

[1] https://crrev.com/c/1816789

BUG=787254
R=guidou@chromium.org, haraken@chromium.org

Change-Id: I76ea8c3477467f5b4956af64cc4b76cc28c20775
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816792
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704731}
parent dc71d70d
...@@ -1957,7 +1957,6 @@ test("content_unittests") { ...@@ -1957,7 +1957,6 @@ test("content_unittests") {
"../renderer/media/webrtc/transceiver_state_surfacer_unittest.cc", "../renderer/media/webrtc/transceiver_state_surfacer_unittest.cc",
"../renderer/media/webrtc/webrtc_audio_renderer_unittest.cc", "../renderer/media/webrtc/webrtc_audio_renderer_unittest.cc",
"../renderer/media/webrtc/webrtc_media_stream_track_adapter_map_unittest.cc", "../renderer/media/webrtc/webrtc_media_stream_track_adapter_map_unittest.cc",
"../renderer/media/webrtc/webrtc_media_stream_track_adapter_unittest.cc",
"../renderer/media/webrtc/webrtc_set_description_observer_unittest.cc", "../renderer/media/webrtc/webrtc_set_description_observer_unittest.cc",
"../renderer/peripheral_content_heuristic_unittest.cc", "../renderer/peripheral_content_heuristic_unittest.cc",
"../renderer/queue_message_swap_promise_unittest.cc", "../renderer/queue_message_swap_promise_unittest.cc",
......
...@@ -389,6 +389,7 @@ jumbo_source_set("unit_tests") { ...@@ -389,6 +389,7 @@ jumbo_source_set("unit_tests") {
"peerconnection/rtc_quic_transport_test.cc", "peerconnection/rtc_quic_transport_test.cc",
"peerconnection/rtc_quic_transport_test.h", "peerconnection/rtc_quic_transport_test.h",
"peerconnection/rtc_sctp_transport_test.cc", "peerconnection/rtc_sctp_transport_test.cc",
"peerconnection/webrtc_media_stream_track_adapter_test.cc",
"picture_in_picture/picture_in_picture_controller_test.cc", "picture_in_picture/picture_in_picture_controller_test.cc",
"presentation/mock_presentation_service.h", "presentation/mock_presentation_service.h",
"presentation/presentation_availability_state_test.cc", "presentation/presentation_availability_state_test.cc",
......
...@@ -21,7 +21,7 @@ include_rules = [ ...@@ -21,7 +21,7 @@ include_rules = [
] ]
specific_include_rules = { specific_include_rules = {
"rtc_data_channel_test\.cc" : [ ".*test\.cc" : [
"+base/run_loop.h", "+base/run_loop.h",
], ],
} }
...@@ -7,12 +7,10 @@ ...@@ -7,12 +7,10 @@
#include <memory> #include <memory>
#include "base/bind.h" #include "base/bind.h"
#include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "base/test/task_environment.h"
#include "content/child/child_process.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/platform/modules/mediastream/media_stream_audio_source.h" #include "third_party/blink/public/platform/modules/mediastream/media_stream_audio_source.h"
#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h" #include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
...@@ -23,8 +21,9 @@ ...@@ -23,8 +21,9 @@
#include "third_party/blink/public/web/modules/mediastream/mock_media_stream_video_source.h" #include "third_party/blink/public/web/modules/mediastream/mock_media_stream_video_source.h"
#include "third_party/blink/public/web/modules/peerconnection/mock_peer_connection_dependency_factory.h" #include "third_party/blink/public/web/modules/peerconnection/mock_peer_connection_dependency_factory.h"
#include "third_party/blink/public/web/web_heap.h" #include "third_party/blink/public/web/web_heap.h"
#include "third_party/blink/renderer/platform/testing/io_task_runner_testing_platform_support.h"
namespace content { namespace blink {
class WebRtcMediaStreamTrackAdapterTest : public ::testing::Test { class WebRtcMediaStreamTrackAdapterTest : public ::testing::Test {
public: public:
...@@ -114,10 +113,7 @@ class WebRtcMediaStreamTrackAdapterTest : public ::testing::Test { ...@@ -114,10 +113,7 @@ class WebRtcMediaStreamTrackAdapterTest : public ::testing::Test {
} }
protected: protected:
// The TaskEnvironment prevents the ChildProcess from leaking a ScopedTestingPlatformSupport<IOTaskRunnerTestingPlatformSupport> platform_;
// ThreadPool.
base::test::TaskEnvironment task_environment_;
ChildProcess child_process_;
std::unique_ptr<blink::MockPeerConnectionDependencyFactory> std::unique_ptr<blink::MockPeerConnectionDependencyFactory>
dependency_factory_; dependency_factory_;
...@@ -272,4 +268,4 @@ TEST_F(WebRtcMediaStreamTrackAdapterTest, LastReferenceOnSignalingThread) { ...@@ -272,4 +268,4 @@ TEST_F(WebRtcMediaStreamTrackAdapterTest, LastReferenceOnSignalingThread) {
RunMessageLoopsUntilIdle(); RunMessageLoopsUntilIdle();
} }
} // namespace content } // namespace blink
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment