| 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 "media/mojo/services/mojo_cdm_factory.h" | 5 #include "media/mojo/services/mojo_cdm_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
| 13 #include "media/base/key_systems.h" | 13 #include "media/base/key_systems.h" |
| 14 #include "media/cdm/aes_decryptor.h" | 14 #include "media/cdm/aes_decryptor.h" |
| 15 #include "media/mojo/interfaces/service_factory.mojom.h" | 15 #include "media/mojo/interfaces/service_factory.mojom.h" |
| 16 #include "media/mojo/services/mojo_cdm.h" | 16 #include "media/mojo/services/mojo_cdm.h" |
| 17 #include "mojo/application/public/cpp/connect.h" | |
| 18 #include "mojo/public/cpp/bindings/interface_request.h" | 17 #include "mojo/public/cpp/bindings/interface_request.h" |
| 18 #include "mojo/shell/public/cpp/connect.h" |
| 19 | 19 |
| 20 namespace media { | 20 namespace media { |
| 21 | 21 |
| 22 MojoCdmFactory::MojoCdmFactory(interfaces::ServiceFactory* service_factory) | 22 MojoCdmFactory::MojoCdmFactory(interfaces::ServiceFactory* service_factory) |
| 23 : service_factory_(service_factory) { | 23 : service_factory_(service_factory) { |
| 24 DCHECK(service_factory_); | 24 DCHECK(service_factory_); |
| 25 } | 25 } |
| 26 | 26 |
| 27 MojoCdmFactory::~MojoCdmFactory() { | 27 MojoCdmFactory::~MojoCdmFactory() { |
| 28 } | 28 } |
| (...skipping 29 matching lines...) Expand all Loading... |
| 58 interfaces::ContentDecryptionModulePtr cdm_ptr; | 58 interfaces::ContentDecryptionModulePtr cdm_ptr; |
| 59 service_factory_->CreateCdm(mojo::GetProxy(&cdm_ptr)); | 59 service_factory_->CreateCdm(mojo::GetProxy(&cdm_ptr)); |
| 60 | 60 |
| 61 MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr), | 61 MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr), |
| 62 session_message_cb, session_closed_cb, | 62 session_message_cb, session_closed_cb, |
| 63 legacy_session_error_cb, session_keys_change_cb, | 63 legacy_session_error_cb, session_keys_change_cb, |
| 64 session_expiration_update_cb, cdm_created_cb); | 64 session_expiration_update_cb, cdm_created_cb); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } // namespace media | 67 } // namespace media |
| OLD | NEW |