[CodeHealth] Remove stale base::Feature WebViewEnumerateDevicesCache
It's been enabled since M110. Bug: 356232666 Change-Id: Ia811bab16d170e7cb6629e4a918e3ecc16a91205 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5970635 Reviewed-by: Alex Mitra <alexmitra@chromium.org> Reviewed-by: Richard (Torne) Coles <torne@chromium.org> Commit-Queue: Richard (Torne) Coles <torne@chromium.org> Auto-Submit: Morten Stenshorne <mstensho@chromium.org> Cr-Commit-Position: refs/heads/main@{#1374732}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
ef18d0b1b5
commit
2480b9b255
android_webview
@ -291,9 +291,6 @@ bool AwWebContentsDelegate::CheckMediaAccessPermission(
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
const url::Origin& security_origin,
|
||||
blink::mojom::MediaStreamType type) {
|
||||
if (!base::FeatureList::IsEnabled(features::kWebViewEnumerateDevicesCache)) {
|
||||
return false;
|
||||
}
|
||||
WebContents* web_contents =
|
||||
WebContents::FromRenderFrameHost(render_frame_host);
|
||||
if (!web_contents) {
|
||||
|
@ -85,9 +85,8 @@ void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) {
|
||||
audio_devices, request_.requested_audio_device_ids);
|
||||
if (device)
|
||||
devices.audio_device = *device;
|
||||
if (base::FeatureList::IsEnabled(features::kWebViewEnumerateDevicesCache) &&
|
||||
(request_.url_origin.scheme() != url::kFileScheme ||
|
||||
can_cache_file_url_permissions_)) {
|
||||
if (request_.url_origin.scheme() != url::kFileScheme ||
|
||||
can_cache_file_url_permissions_) {
|
||||
permission_manager_->SetOriginCanReadEnumerateDevicesAudioLabels(
|
||||
request_.url_origin, true);
|
||||
}
|
||||
@ -103,9 +102,8 @@ void MediaAccessPermissionRequest::NotifyRequestResult(bool allowed) {
|
||||
video_devices, request_.requested_video_device_ids);
|
||||
if (device)
|
||||
devices.video_device = *device;
|
||||
if (base::FeatureList::IsEnabled(features::kWebViewEnumerateDevicesCache) &&
|
||||
(request_.url_origin.scheme() != url::kFileScheme ||
|
||||
can_cache_file_url_permissions_)) {
|
||||
if (request_.url_origin.scheme() != url::kFileScheme ||
|
||||
can_cache_file_url_permissions_) {
|
||||
permission_manager_->SetOriginCanReadEnumerateDevicesVideoLabels(
|
||||
request_.url_origin, true);
|
||||
}
|
||||
|
@ -183,20 +183,4 @@ TEST_F(MediaAccessPermissionRequestTest,
|
||||
aw_permission_manager_.ShouldShowEnumerateDevicesVideoLabels(origin));
|
||||
}
|
||||
|
||||
TEST_F(MediaAccessPermissionRequestTest,
|
||||
TestGrantedPermissionRequestWithoutCacheFailsEnumerateDevices) {
|
||||
feature_list_.InitAndDisableFeature(features::kWebViewEnumerateDevicesCache);
|
||||
url::Origin origin = url::Origin::Create(GURL("https://www.google.com"));
|
||||
EXPECT_FALSE(
|
||||
aw_permission_manager_.ShouldShowEnumerateDevicesAudioLabels(origin));
|
||||
EXPECT_FALSE(
|
||||
aw_permission_manager_.ShouldShowEnumerateDevicesVideoLabels(origin));
|
||||
std::unique_ptr<TestMediaAccessPermissionRequest> request =
|
||||
CreateRequest(audio_device_id_, video_device_id_);
|
||||
request->NotifyRequestResult(true);
|
||||
EXPECT_FALSE(
|
||||
aw_permission_manager_.ShouldShowEnumerateDevicesAudioLabels(origin));
|
||||
EXPECT_FALSE(
|
||||
aw_permission_manager_.ShouldShowEnumerateDevicesVideoLabels(origin));
|
||||
}
|
||||
} // namespace android_webview
|
||||
|
@ -39,12 +39,6 @@ BASE_FEATURE(kWebViewDragDropFiles,
|
||||
"WebViewDragDropFiles",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
// Cache origins which have camera/mic permissions approved to allow subsequent
|
||||
// calls to enumerate devices to return device labels.
|
||||
BASE_FEATURE(kWebViewEnumerateDevicesCache,
|
||||
"WebViewEnumerateDevicesCache",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
// Enable JS FileSystemAccess API.
|
||||
// TODO(b/364980165): Add targetSdkVersion checks before enabling.
|
||||
BASE_FEATURE(kWebViewFileSystemAccess,
|
||||
|
@ -21,7 +21,6 @@ BASE_DECLARE_FEATURE(kWebViewCheckPakFileDescriptors);
|
||||
BASE_DECLARE_FEATURE(kWebViewDigitalAssetLinksLoadIncludes);
|
||||
BASE_DECLARE_FEATURE(kWebViewDisplayCutout);
|
||||
BASE_DECLARE_FEATURE(kWebViewDragDropFiles);
|
||||
BASE_DECLARE_FEATURE(kWebViewEnumerateDevicesCache);
|
||||
BASE_DECLARE_FEATURE(kWebViewExtraHeadersSameOriginOnly);
|
||||
BASE_DECLARE_FEATURE(kWebViewFileSystemAccess);
|
||||
BASE_DECLARE_FEATURE(kWebViewForceDarkModeMatchTheme);
|
||||
|
Reference in New Issue
Block a user