OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chromecast/media/audio/cast_audio_manager_factory.h" | 5 #include "chromecast/media/audio/cast_audio_manager_factory.h" |
6 | 6 |
| 7 #include <memory> |
| 8 |
7 #include "chromecast/media/audio/cast_audio_manager.h" | 9 #include "chromecast/media/audio/cast_audio_manager.h" |
8 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h" | 10 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h" |
9 | 11 |
10 namespace chromecast { | 12 namespace chromecast { |
11 namespace media { | 13 namespace media { |
12 | 14 |
13 CastAudioManagerFactory::CastAudioManagerFactory( | 15 CastAudioManagerFactory::CastAudioManagerFactory( |
14 MediaPipelineBackendManager* backend_manager) | 16 MediaPipelineBackendManager* backend_manager) |
15 : backend_manager_(backend_manager) { | 17 : backend_manager_(backend_manager) { |
16 } | 18 } |
17 | 19 |
18 CastAudioManagerFactory::~CastAudioManagerFactory() {} | 20 CastAudioManagerFactory::~CastAudioManagerFactory() {} |
19 | 21 |
20 scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter> | 22 std::unique_ptr<::media::AudioManager, ::media::AudioManagerDeleter> |
21 CastAudioManagerFactory::CreateInstance( | 23 CastAudioManagerFactory::CreateInstance( |
22 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 24 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
23 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, | 25 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, |
24 ::media::AudioLogFactory* audio_log_factory) { | 26 ::media::AudioLogFactory* audio_log_factory) { |
25 return scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter>( | 27 return std::unique_ptr<::media::AudioManager, ::media::AudioManagerDeleter>( |
26 new CastAudioManager(std::move(task_runner), | 28 new CastAudioManager(std::move(task_runner), |
27 std::move(worker_task_runner), audio_log_factory, | 29 std::move(worker_task_runner), audio_log_factory, |
28 backend_manager_)); | 30 backend_manager_)); |
29 } | 31 } |
30 | 32 |
31 } // namespace media | 33 } // namespace media |
32 } // namespace chromecast | 34 } // namespace chromecast |
OLD | NEW |