Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(793)

Unified Diff: content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc

Issue 2436113002: Introduce MediaDevicesPermissionChecker. (Closed)
Patch Set: address xhwang's comments Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/media/media_devices_dispatcher_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
index f980126999dd8d3da854b2ed96b2053323ecc6f6..658d47b892ed3af485a2d4d55134eebbc0bbdd03 100644
--- a/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
@@ -64,7 +64,7 @@ class MediaDevicesDispatcherHostTest : public testing::Test {
host_ = base::MakeUnique<MediaDevicesDispatcherHost>(
kProcessId, kRenderId, mock_resource_context->GetMediaDeviceIDSalt(),
- media_stream_manager_.get(), true /* use_fake_ui */);
+ media_stream_manager_.get());
}
void SetUp() override {
@@ -92,13 +92,13 @@ class MediaDevicesDispatcherHostTest : public testing::Test {
closure.Run();
}
- void EnumerateDevicesAndWaitForResult(
- bool enumerate_audio_input,
- bool enumerate_video_input,
- bool enumerate_audio_output,
- std::unique_ptr<MediaStreamUIProxy> ui_proxy) {
- if (ui_proxy)
- host_->SetFakeUIProxyForTesting(std::move(ui_proxy));
+ void EnumerateDevicesAndWaitForResult(bool enumerate_audio_input,
+ bool enumerate_video_input,
+ bool enumerate_audio_output,
+ bool permission_override_value = true) {
+ MediaDevicesPermissionChecker permission_checker;
+ permission_checker.OverridePermissionsForTesting(permission_override_value);
+ host_->SetPermissionChecker(permission_checker);
base::RunLoop run_loop;
host_->EnumerateDevices(
enumerate_audio_input, enumerate_video_input, enumerate_audio_output,
@@ -197,58 +197,42 @@ class MediaDevicesDispatcherHostTest : public testing::Test {
};
TEST_F(MediaDevicesDispatcherHostTest, EnumerateAudioInputDevices) {
- EnumerateDevicesAndWaitForResult(true, false, false, nullptr);
+ EnumerateDevicesAndWaitForResult(true, false, false);
EXPECT_TRUE(DoesContainLabels(enumerated_devices_));
}
TEST_F(MediaDevicesDispatcherHostTest, EnumerateVideoInputDevices) {
- EnumerateDevicesAndWaitForResult(false, true, false, nullptr);
+ EnumerateDevicesAndWaitForResult(false, true, false);
EXPECT_TRUE(DoesContainLabels(enumerated_devices_));
}
TEST_F(MediaDevicesDispatcherHostTest, EnumerateAudioOutputDevices) {
- EnumerateDevicesAndWaitForResult(false, false, true, nullptr);
+ EnumerateDevicesAndWaitForResult(false, false, true);
EXPECT_TRUE(DoesContainLabels(enumerated_devices_));
}
TEST_F(MediaDevicesDispatcherHostTest, EnumerateAllDevices) {
- EnumerateDevicesAndWaitForResult(true, true, true, nullptr);
+ EnumerateDevicesAndWaitForResult(true, true, true);
EXPECT_TRUE(DoesContainLabels(enumerated_devices_));
}
TEST_F(MediaDevicesDispatcherHostTest, EnumerateAudioInputDevicesNoAccess) {
- std::unique_ptr<FakeMediaStreamUIProxy> fake_ui_proxy =
- base::MakeUnique<FakeMediaStreamUIProxy>();
- fake_ui_proxy->SetMicAccess(false);
- EnumerateDevicesAndWaitForResult(true, false, false,
- std::move(fake_ui_proxy));
+ EnumerateDevicesAndWaitForResult(true, false, false, false);
EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_));
}
TEST_F(MediaDevicesDispatcherHostTest, EnumerateVideoInputDevicesNoAccess) {
- std::unique_ptr<FakeMediaStreamUIProxy> fake_ui_proxy =
- base::MakeUnique<FakeMediaStreamUIProxy>();
- fake_ui_proxy->SetCameraAccess(false);
- EnumerateDevicesAndWaitForResult(false, true, false,
- std::move(fake_ui_proxy));
+ EnumerateDevicesAndWaitForResult(false, true, false, false);
EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_));
}
TEST_F(MediaDevicesDispatcherHostTest, EnumerateAudioOutputDevicesNoAccess) {
- std::unique_ptr<FakeMediaStreamUIProxy> fake_ui_proxy =
- base::MakeUnique<FakeMediaStreamUIProxy>();
- fake_ui_proxy->SetMicAccess(false);
- EnumerateDevicesAndWaitForResult(false, false, true,
- std::move(fake_ui_proxy));
+ EnumerateDevicesAndWaitForResult(false, false, true, false);
EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_));
}
TEST_F(MediaDevicesDispatcherHostTest, EnumerateAllDevicesNoAccess) {
- std::unique_ptr<FakeMediaStreamUIProxy> fake_ui_proxy =
- base::MakeUnique<FakeMediaStreamUIProxy>();
- fake_ui_proxy->SetMicAccess(false);
- fake_ui_proxy->SetCameraAccess(false);
- EnumerateDevicesAndWaitForResult(true, true, true, std::move(fake_ui_proxy));
+ EnumerateDevicesAndWaitForResult(true, true, true, false);
EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_));
}
« no previous file with comments | « content/browser/renderer_host/media/media_devices_dispatcher_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698