Remove AudioServiceAudioStreams flag and old audio codepaths
The audio service is enabled by default on all platforms since M75.
There is no need to keep the old codepaths anymore.
Several parameterized tests running with and without service/process
have been deparameterized so that they run with the default process
configuration.
Bug: 1019245
Change-Id: Icf02a989f4579a39d15dcd33094a94f422231e15
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1887810
Reviewed-by: Ken Rockot <[email protected]>
Reviewed-by: Sean Topping <[email protected]>
Reviewed-by: Yuri Wiitala <[email protected]>
Reviewed-by: mark a. foltz <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Olga Sharonova <[email protected]>
Commit-Queue: Guido Urdaneta <[email protected]>
Cr-Commit-Position: refs/heads/master@{#715629}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c22a83d..865bbaf 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1492,10 +1492,7 @@
}
bool WebContentsImpl::IsAudioMuted() {
- if (base::FeatureList::IsEnabled(features::kAudioServiceAudioStreams)) {
- return audio_stream_factory_ && audio_stream_factory_->IsMuted();
- }
- return audio_muter_.get() && audio_muter_->is_muting();
+ return audio_stream_factory_ && audio_stream_factory_->IsMuted();
}
void WebContentsImpl::SetAudioMuted(bool mute) {
@@ -1505,18 +1502,7 @@
if (mute == IsAudioMuted())
return;
- if (base::FeatureList::IsEnabled(features::kAudioServiceAudioStreams)) {
- GetAudioStreamFactory()->SetMuted(mute);
- } else {
- if (mute) {
- if (!audio_muter_)
- audio_muter_.reset(new WebContentsAudioMuter(this));
- audio_muter_->StartMuting();
- } else {
- DCHECK(audio_muter_);
- audio_muter_->StopMuting();
- }
- }
+ GetAudioStreamFactory()->SetMuted(mute);
for (auto& observer : observers_)
observer.DidUpdateAudioMutingState(mute);
@@ -6830,9 +6816,6 @@
}
base::UnguessableToken WebContentsImpl::GetAudioGroupId() {
- if (!base::FeatureList::IsEnabled(features::kAudioServiceAudioStreams))
- return base::UnguessableToken::Null();
-
return GetAudioStreamFactory()->group_id();
}
