| Index: media/audio/audio_manager_base.h
|
| diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
|
| index 61292c6712f9648d54cbc8deaf42e8f423f8d8c3..e7e146ec7defb83865b653ba77ad14edade5bbb0 100644
|
| --- a/media/audio/audio_manager_base.h
|
| +++ b/media/audio/audio_manager_base.h
|
| @@ -5,18 +5,17 @@
|
| #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
|
| #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <utility>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/observer_list.h"
|
| #include "base/threading/thread.h"
|
| #include "build/build_config.h"
|
| #include "media/audio/audio_manager.h"
|
| -
|
| #include "media/audio/audio_output_dispatcher.h"
|
|
|
| #if defined(OS_WIN)
|
| @@ -87,7 +86,7 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
|
| const std::string& device_id) override;
|
| std::string GetAssociatedOutputDeviceID(
|
| const std::string& input_device_id) override;
|
| - scoped_ptr<AudioLog> CreateAudioLog(
|
| + std::unique_ptr<AudioLog> CreateAudioLog(
|
| AudioLogFactory::AudioComponent component) override;
|
|
|
| // AudioManagerBase:
|
|
|