| Index: media/audio/android/audio_manager_android.h
|
| diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h
|
| index 2f3f2507f4e6eded405d17f1627b49c5fa5edc1d..20707bc5d274bc08d50b4a6c6fd455db4c9dbb2c 100644
|
| --- a/media/audio/android/audio_manager_android.h
|
| +++ b/media/audio/android/audio_manager_android.h
|
| @@ -20,10 +20,9 @@ class OpenSLESOutputStream;
|
| // Android implemention of AudioManager.
|
| class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
| public:
|
| - AudioManagerAndroid(
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| - scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
|
| - AudioLogFactory* audio_log_factory);
|
| + AudioManagerAndroid(std::unique_ptr<AudioThread> audio_thread,
|
| + AudioLogFactory* audio_log_factory);
|
| + ~AudioManagerAndroid() override;
|
|
|
| void InitializeIfNeeded();
|
|
|
| @@ -76,8 +75,7 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
|
| bool HasOutputVolumeOverride(double* out_volume) const;
|
|
|
| protected:
|
| - ~AudioManagerAndroid() override;
|
| -
|
| + void ShutdownOnAudioThread() override;
|
| AudioParameters GetPreferredOutputStreamParameters(
|
| const std::string& output_device_id,
|
| const AudioParameters& input_params) override;
|
|
|