Index: media/mojo/services/mojo_cdm_factory.cc |
diff --git a/media/mojo/services/mojo_cdm_factory.cc b/media/mojo/services/mojo_cdm_factory.cc |
index 3937c10be3370b9bcccc6e45cbaeeac92660200f..2bfbd8f2593cc614547d2b593219c36e4a9b83a3 100644 |
--- a/media/mojo/services/mojo_cdm_factory.cc |
+++ b/media/mojo/services/mojo_cdm_factory.cc |
@@ -6,20 +6,17 @@ |
#include "base/bind.h" |
#include "base/location.h" |
-#include "base/single_thread_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
#include "media/base/key_systems.h" |
#include "media/cdm/aes_decryptor.h" |
-#include "media/mojo/interfaces/service_factory.mojom.h" |
#include "media/mojo/services/mojo_cdm.h" |
#include "mojo/application/public/cpp/connect.h" |
-#include "mojo/public/cpp/bindings/interface_request.h" |
namespace media { |
-MojoCdmFactory::MojoCdmFactory(interfaces::ServiceFactory* service_factory) |
- : service_factory_(service_factory) { |
- DCHECK(service_factory_); |
+MojoCdmFactory::MojoCdmFactory(mojo::ServiceProvider* service_provider) |
+ : service_provider_(service_provider) { |
+ DCHECK(service_provider_); |
} |
MojoCdmFactory::~MojoCdmFactory() { |
@@ -36,7 +33,6 @@ void MojoCdmFactory::Create( |
const SessionExpirationUpdateCB& session_expiration_update_cb, |
const CdmCreatedCB& cdm_created_cb) { |
DVLOG(2) << __FUNCTION__ << ": " << key_system; |
- DCHECK(service_factory_); |
if (!security_origin.is_valid()) { |
base::ThreadTaskRunnerHandle::Get()->PostTask( |
@@ -54,8 +50,7 @@ void MojoCdmFactory::Create( |
} |
interfaces::ContentDecryptionModulePtr cdm_ptr; |
- service_factory_->CreateCdm(mojo::GetProxy(&cdm_ptr)); |
- |
+ mojo::ConnectToService(service_provider_, &cdm_ptr); |
MojoCdm::Create(key_system, security_origin, cdm_config, cdm_ptr.Pass(), |
session_message_cb, session_closed_cb, |
legacy_session_error_cb, session_keys_change_cb, |