| 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 "chromecast/media/audio/cast_audio_manager.h" | 7 #include "chromecast/media/audio/cast_audio_manager.h" |
| 8 | 8 |
| 9 namespace chromecast { | 9 namespace chromecast { |
| 10 namespace media { | 10 namespace media { |
| 11 | 11 |
| 12 CastAudioManagerFactory::CastAudioManagerFactory() {} | 12 CastAudioManagerFactory::CastAudioManagerFactory() {} |
| 13 | 13 |
| 14 CastAudioManagerFactory::~CastAudioManagerFactory() {} | 14 CastAudioManagerFactory::~CastAudioManagerFactory() {} |
| 15 | 15 |
| 16 ::media::AudioManager* CastAudioManagerFactory::CreateInstance( | 16 scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter> |
| 17 CastAudioManagerFactory::CreateInstance( |
| 18 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 19 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, |
| 17 ::media::AudioLogFactory* audio_log_factory) { | 20 ::media::AudioLogFactory* audio_log_factory) { |
| 18 return new CastAudioManager(audio_log_factory); | 21 return scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter>( |
| 22 new CastAudioManager(std::move(task_runner), |
| 23 std::move(worker_task_runner), audio_log_factory)); |
| 19 } | 24 } |
| 20 | 25 |
| 21 } // namespace media | 26 } // namespace media |
| 22 } // namespace chromecast | 27 } // namespace chromecast |
| OLD | NEW |