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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Issue 678023002: TabSpecificContentSettings no longer knows about MediaStreamDeviceController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Win complilation error C4800 Created 6 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
« chrome/browser/content_settings/tab_specific_content_settings.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | chrome/browser/media/media_stream_devices_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
index d3a18b61a92841e030da836318213e73e3dabe27..33a03db6a8311be4512d3040ce71aeab34e8e5c7 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
@@ -74,13 +74,18 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
false);
content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES);
content_settings->SetPopupsBlocked(true);
- MediaStreamDevicesController::MediaStreamTypeSettingsMap request_permissions;
- request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
- request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
+ TabSpecificContentSettings::MicrophoneCameraState
+ blocked_microphone_camera_state =
+ TabSpecificContentSettings::MICROPHONE_ACCESSED |
+ TabSpecificContentSettings::MICROPHONE_BLOCKED |
+ TabSpecificContentSettings::CAMERA_ACCESSED |
+ TabSpecificContentSettings::CAMERA_BLOCKED;
content_settings->OnMediaStreamPermissionSet(GURL("http://google.com"),
- request_permissions);
+ blocked_microphone_camera_state,
+ std::string(),
+ std::string(),
+ std::string(),
+ std::string());
// Check that only the respective content types are affected.
EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
@@ -199,163 +204,6 @@ TEST_F(TabSpecificContentSettingsTest, AllowedContent) {
content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
}
-TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
- TabSpecificContentSettings* content_settings =
- TabSpecificContentSettings::FromWebContents(web_contents());
-
- ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_NOT_ACCESSED,
- content_settings->GetMicrophoneCameraState());
-
- // Request and allow microphone access.
- GURL security_origin("http://google.com");
- MediaStreamDevicesController::MediaStreamTypeSettingsMap
- request_permissions;
- request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_ALLOWED;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED,
- content_settings->GetMicrophoneCameraState());
-
- // Request and allow camera access.
- request_permissions.clear();
- request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_ALLOWED;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- // cam request should not affect previous mic settings.
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED,
- content_settings->GetMicrophoneCameraState());
-
- // Request and block microphone access.
- request_permissions.clear();
- request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_FALSE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_TRUE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- // mic request should not affect previous cam settings.
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
- TabSpecificContentSettings::MICROPHONE_BLOCKED,
- content_settings->GetMicrophoneCameraState());
-
- // Request and block camera access.
- request_permissions.clear();
- request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_FALSE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_TRUE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- // cam request should not affect previous mic settings.
- ASSERT_FALSE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_TRUE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED |
- TabSpecificContentSettings::CAMERA_BLOCKED,
- content_settings->GetMicrophoneCameraState());
-
- // Request and allow microphone and camera access.
- request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_ALLOWED;
- request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_ALLOWED;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
- TabSpecificContentSettings::CAMERA_ACCESSED,
- content_settings->GetMicrophoneCameraState());
-
- // Request and block microphone and camera access.
- request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
- request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_FALSE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_TRUE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_FALSE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_TRUE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
- TabSpecificContentSettings::MICROPHONE_BLOCKED |
- TabSpecificContentSettings::CAMERA_ACCESSED |
- TabSpecificContentSettings::CAMERA_BLOCKED,
- content_settings->GetMicrophoneCameraState());
-
- // Request microphone and camera access. Allow microphone, block camera.
- request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_ALLOWED;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_FALSE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_TRUE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
- TabSpecificContentSettings::CAMERA_ACCESSED |
- TabSpecificContentSettings::CAMERA_BLOCKED,
- content_settings->GetMicrophoneCameraState());
-
- // Request microphone and camera access. Block microphone, allow camera.
- request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
- request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
- MediaStreamDevicesController::MEDIA_ALLOWED;
- content_settings->OnMediaStreamPermissionSet(security_origin,
- request_permissions);
- ASSERT_FALSE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_TRUE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
- ASSERT_TRUE(content_settings->IsContentAllowed(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_FALSE(content_settings->IsContentBlocked(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
- ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
- TabSpecificContentSettings::MICROPHONE_BLOCKED |
- TabSpecificContentSettings::CAMERA_ACCESSED,
- content_settings->GetMicrophoneCameraState());
-}
-
TEST_F(TabSpecificContentSettingsTest, EmptyCookieList) {
TabSpecificContentSettings* content_settings =
TabSpecificContentSettings::FromWebContents(web_contents());
« chrome/browser/content_settings/tab_specific_content_settings.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | chrome/browser/media/media_stream_devices_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698