| Index: media/audio/audio_output_device.cc
|
| diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
|
| index 1d52911686edc6417d1c035e4406272c74596ab5..145d0f69d22a1dc48cf7c802a5cda76d69c5db03 100644
|
| --- a/media/audio/audio_output_device.cc
|
| +++ b/media/audio/audio_output_device.cc
|
| @@ -278,7 +278,7 @@ void AudioOutputDevice::SetVolumeOnIOThread(double volume) {
|
| ipc_->SetVolume(volume);
|
| }
|
|
|
| -void AudioOutputDevice::OnStateChanged(AudioOutputIPCDelegateState state) {
|
| +/*void AudioOutputDevice::OnStateChanged(mojom::AudioOutputStreamState state) {
|
| DCHECK(task_runner()->BelongsToCurrentThread());
|
|
|
| // Do nothing if the stream has been closed.
|
| @@ -288,10 +288,10 @@ void AudioOutputDevice::OnStateChanged(AudioOutputIPCDelegateState state) {
|
| // TODO(miu): Clean-up inconsistent and incomplete handling here.
|
| // http://crbug.com/180640
|
| switch (state) {
|
| - case AUDIO_OUTPUT_IPC_DELEGATE_STATE_PLAYING:
|
| - case AUDIO_OUTPUT_IPC_DELEGATE_STATE_PAUSED:
|
| + case mojom::AudioOutputStreamState::PLAYING:
|
| + case mojom::AudioOutputStreamState::PAUSED:
|
| break;
|
| - case AUDIO_OUTPUT_IPC_DELEGATE_STATE_ERROR:
|
| + case mojom::AudioOutputStreamState::ERROR:
|
| DLOG(WARNING) << "AudioOutputDevice::OnStateChanged(ERROR)";
|
| // Don't dereference the callback object if the audio thread
|
| // is stopped or stopping. That could mean that the callback
|
| @@ -309,7 +309,7 @@ void AudioOutputDevice::OnStateChanged(AudioOutputIPCDelegateState state) {
|
| NOTREACHED();
|
| break;
|
| }
|
| -}
|
| +}*/
|
|
|
| void AudioOutputDevice::OnDeviceAuthorized(
|
| OutputDeviceStatus device_status,
|
|
|