Commit 769bffbf authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Remove use of {Mock}PeerConnectionDependencyFactory in user_media_client_impl_unittest.cc

Another preparation step to Onion souping this test
and its respective production code.

BUG=704136
R=guidou@chromium.org

Change-Id: I213eee21c66213c06350413600f2fbe487c5cd2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1731449
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Auto-Submit: 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@{#683201}
parent a56f7bc0
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "base/test/scoped_task_environment.h" #include "base/test/scoped_task_environment.h"
#include "content/child/child_process.h" #include "content/child/child_process.h"
#include "content/renderer/media/stream/mock_mojo_media_stream_dispatcher_host.h" #include "content/renderer/media/stream/mock_mojo_media_stream_dispatcher_host.h"
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
#include "media/audio/audio_device_description.h" #include "media/audio/audio_device_description.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -158,8 +157,7 @@ class MockMediaStreamVideoCapturerSource ...@@ -158,8 +157,7 @@ class MockMediaStreamVideoCapturerSource
: public blink::MockMediaStreamVideoSource { : public blink::MockMediaStreamVideoSource {
public: public:
MockMediaStreamVideoCapturerSource(const blink::MediaStreamDevice& device, MockMediaStreamVideoCapturerSource(const blink::MediaStreamDevice& device,
const SourceStoppedCallback& stop_callback, const SourceStoppedCallback& stop_callback)
PeerConnectionDependencyFactory* factory)
: blink::MockMediaStreamVideoSource() { : blink::MockMediaStreamVideoSource() {
SetDevice(device); SetDevice(device);
SetStopCallback(stop_callback); SetStopCallback(stop_callback);
...@@ -301,7 +299,6 @@ enum RequestState { ...@@ -301,7 +299,6 @@ enum RequestState {
class UserMediaProcessorUnderTest : public UserMediaProcessor { class UserMediaProcessorUnderTest : public UserMediaProcessor {
public: public:
UserMediaProcessorUnderTest( UserMediaProcessorUnderTest(
PeerConnectionDependencyFactory* dependency_factory,
std::unique_ptr<blink::WebMediaStreamDeviceObserver> std::unique_ptr<blink::WebMediaStreamDeviceObserver>
media_stream_device_observer, media_stream_device_observer,
blink::mojom::MediaDevicesDispatcherHostPtr media_devices_dispatcher, blink::mojom::MediaDevicesDispatcherHostPtr media_devices_dispatcher,
...@@ -313,7 +310,6 @@ class UserMediaProcessorUnderTest : public UserMediaProcessor { ...@@ -313,7 +310,6 @@ class UserMediaProcessorUnderTest : public UserMediaProcessor {
&UserMediaProcessorUnderTest::media_devices_dispatcher, &UserMediaProcessorUnderTest::media_devices_dispatcher,
base::Unretained(this)), base::Unretained(this)),
blink::scheduler::GetSingleThreadTaskRunnerForTesting()), blink::scheduler::GetSingleThreadTaskRunnerForTesting()),
factory_(dependency_factory),
media_devices_dispatcher_(std::move(media_devices_dispatcher)), media_devices_dispatcher_(std::move(media_devices_dispatcher)),
state_(state) {} state_(state) {}
...@@ -356,7 +352,7 @@ class UserMediaProcessorUnderTest : public UserMediaProcessor { ...@@ -356,7 +352,7 @@ class UserMediaProcessorUnderTest : public UserMediaProcessor {
const blink::WebPlatformMediaStreamSource::SourceStoppedCallback& const blink::WebPlatformMediaStreamSource::SourceStoppedCallback&
stop_callback) override { stop_callback) override {
video_source_ = video_source_ =
new MockMediaStreamVideoCapturerSource(device, stop_callback, factory_); new MockMediaStreamVideoCapturerSource(device, stop_callback);
return base::WrapUnique(video_source_); return base::WrapUnique(video_source_);
} }
...@@ -423,7 +419,6 @@ class UserMediaProcessorUnderTest : public UserMediaProcessor { ...@@ -423,7 +419,6 @@ class UserMediaProcessorUnderTest : public UserMediaProcessor {
.Run(source, blink::mojom::MediaStreamRequestResult::OK, ""); .Run(source, blink::mojom::MediaStreamRequestResult::OK, "");
} }
PeerConnectionDependencyFactory* factory_;
blink::mojom::MediaDevicesDispatcherHostPtr media_devices_dispatcher_; blink::mojom::MediaDevicesDispatcherHostPtr media_devices_dispatcher_;
MockMediaStreamVideoCapturerSource* video_source_ = nullptr; MockMediaStreamVideoCapturerSource* video_source_ = nullptr;
MockLocalMediaStreamAudioSource* local_audio_source_ = nullptr; MockLocalMediaStreamAudioSource* local_audio_source_ = nullptr;
...@@ -473,15 +468,13 @@ class UserMediaClientImplTest : public ::testing::Test { ...@@ -473,15 +468,13 @@ class UserMediaClientImplTest : public ::testing::Test {
void SetUp() override { void SetUp() override {
// Create our test object. // Create our test object.
dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
msd_observer_ = new blink::WebMediaStreamDeviceObserver(nullptr); msd_observer_ = new blink::WebMediaStreamDeviceObserver(nullptr);
blink::mojom::MediaDevicesDispatcherHostPtr user_media_processor_host_proxy; blink::mojom::MediaDevicesDispatcherHostPtr user_media_processor_host_proxy;
binding_user_media_processor_.Bind( binding_user_media_processor_.Bind(
mojo::MakeRequest(&user_media_processor_host_proxy)); mojo::MakeRequest(&user_media_processor_host_proxy));
user_media_processor_ = new UserMediaProcessorUnderTest( user_media_processor_ = new UserMediaProcessorUnderTest(
dependency_factory_.get(), base::WrapUnique(msd_observer_), base::WrapUnique(msd_observer_),
std::move(user_media_processor_host_proxy), &state_); std::move(user_media_processor_host_proxy), &state_);
blink::mojom::MediaStreamDispatcherHostPtr dispatcher_host = blink::mojom::MediaStreamDispatcherHostPtr dispatcher_host =
mock_dispatcher_host_.CreateInterfacePtrAndBind(); mock_dispatcher_host_.CreateInterfacePtrAndBind();
...@@ -649,7 +642,6 @@ class UserMediaClientImplTest : public ::testing::Test { ...@@ -649,7 +642,6 @@ class UserMediaClientImplTest : public ::testing::Test {
UserMediaProcessorUnderTest* user_media_processor_ = UserMediaProcessorUnderTest* user_media_processor_ =
nullptr; // Owned by |user_media_client_impl_| nullptr; // Owned by |user_media_client_impl_|
std::unique_ptr<UserMediaClientImplUnderTest> user_media_client_impl_; std::unique_ptr<UserMediaClientImplUnderTest> user_media_client_impl_;
std::unique_ptr<MockPeerConnectionDependencyFactory> dependency_factory_;
RequestState state_ = REQUEST_NOT_STARTED; RequestState state_ = REQUEST_NOT_STARTED;
}; };
......
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