[Chromecast] CastAudioOutputStream streams are not SFX anymore

Local sound effects use CastSoundsManager now, so all streams going
through CastAudioOutputStream should be "normal" stream type.

Change-Id: I7a132a90dab914e1135a533f180174cc3f898049
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1697373Reviewed-by: Sergey Volk <servolk@chromium.org>
Commit-Queue: Kenneth MacKay <kmackay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#677086}

chromecast/media/audio/cast_audio_output_stream.cc

@@ -188,16 +188,10 @@ void CastAudioOutputStream::CmaWrapper::Initialize(
     return;
   media_thread_state_ = kOpened;
 
-  MediaPipelineDeviceParams::AudioStreamType stream_type =
-      MediaPipelineDeviceParams::kAudioStreamSoundEffects;
-  if (audio_params_.effects() & ::media::AudioParameters::MULTIZONE ||
-      device_id_ != ::media::AudioDeviceDescription::kDefaultDeviceId) {
-    stream_type = MediaPipelineDeviceParams::kAudioStreamNormal;
-  }
-
   cma_backend_task_runner_ = std::make_unique<TaskRunnerImpl>();
   MediaPipelineDeviceParams device_params(
-      MediaPipelineDeviceParams::kModeIgnorePts, stream_type,
+      MediaPipelineDeviceParams::kModeIgnorePts,
+      MediaPipelineDeviceParams::kAudioStreamNormal,
       cma_backend_task_runner_.get(), GetContentType(device_id_), device_id_);
   device_params.session_id = application_session_id;
   device_params.multiroom = multiroom_info->multiroom;
@@ -503,17 +497,8 @@ void CastAudioOutputStream::MixerServiceWrapper::Start(
   media::mixer_service::MixerStreamParams params;
   params.set_content_type(ConvertContentType(GetContentType(device_id_)));
   params.set_device_id(device_id_);
-  // We use the default device ID for sound effects (eg volume boop), so mark
-  // those as SFX streams so they are treated correctly. Other device ID
-  // streams should act like normal (non-sound-effects) streams for redirection
-  // and other features.
-  if (device_id_ == ::media::AudioDeviceDescription::kDefaultDeviceId) {
-    params.set_stream_type(
-        media::mixer_service::MixerStreamParams::STREAM_TYPE_SFX);
-  } else {
-    params.set_stream_type(
-        media::mixer_service::MixerStreamParams::STREAM_TYPE_DEFAULT);
-  }
+  params.set_stream_type(
+      media::mixer_service::MixerStreamParams::STREAM_TYPE_DEFAULT);
   params.set_sample_format(
       media::mixer_service::MixerStreamParams::SAMPLE_FORMAT_FLOAT_P);
   params.set_sample_rate(audio_params_.sample_rate());