| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "media/mojo/services/media_service_factory.h" | 5 #include "media/mojo/services/media_service_factory.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "media/mojo/services/gpu_mojo_media_client.h" | 9 #include "media/mojo/services/gpu_mojo_media_client.h" |
| 10 #include "media/mojo/services/media_service.h" | 10 #include "media/mojo/services/media_service.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 return std::unique_ptr<service_manager::Service>( | 35 return std::unique_ptr<service_manager::Service>( |
| 36 new MediaService(base::MakeUnique<GpuMojoMediaClient>( | 36 new MediaService(base::MakeUnique<GpuMojoMediaClient>( |
| 37 task_runner, media_gpu_channel_manager))); | 37 task_runner, media_gpu_channel_manager))); |
| 38 } | 38 } |
| 39 | 39 |
| 40 std::unique_ptr<service_manager::Service> CreateMediaServiceForTesting() { | 40 std::unique_ptr<service_manager::Service> CreateMediaServiceForTesting() { |
| 41 return std::unique_ptr<service_manager::Service>( | 41 return std::unique_ptr<service_manager::Service>( |
| 42 new MediaService(base::MakeUnique<TestMojoMediaClient>())); | 42 new MediaService(base::MakeUnique<TestMojoMediaClient>())); |
| 43 } | 43 } |
| 44 | 44 |
| 45 std::unique_ptr<service_manager::Service> CreateUtilityMediaService() { | 45 std::unique_ptr<service_manager::Service> CreateUtilityMediaService( |
| 46 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { |
| 46 return std::unique_ptr<service_manager::Service>( | 47 return std::unique_ptr<service_manager::Service>( |
| 47 new MediaService(base::MakeUnique<UtilityMojoMediaClient>())); | 48 new MediaService(base::MakeUnique<UtilityMojoMediaClient>(task_runner))); |
| 48 } | 49 } |
| 49 | 50 |
| 50 } // namespace media | 51 } // namespace media |
| OLD | NEW |