Chromium Code Reviews| Index: media/base/android/android_cdm_factory.cc |
| diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc |
| index 45bfad543c7675480e3655a351c739178ea2a4c3..a1beb36e8ac7dc6dd0455b546641273972331e0c 100644 |
| --- a/media/base/android/android_cdm_factory.cc |
| +++ b/media/base/android/android_cdm_factory.cc |
| @@ -6,6 +6,7 @@ |
| #include "base/strings/string_number_conversions.h" |
| #include "media/base/android/media_drm_bridge.h" |
| +#include "media/base/android/provision_fetcher.h" |
| #include "media/base/bind_to_current_loop.h" |
| #include "media/base/cdm_config.h" |
| #include "media/base/key_systems.h" |
| @@ -14,7 +15,9 @@ |
| namespace media { |
| -AndroidCdmFactory::AndroidCdmFactory() {} |
| +AndroidCdmFactory::AndroidCdmFactory( |
| + scoped_ptr<ProvisionFetcherFactory> fetcher_factory) |
| + : fetcher_factory_(fetcher_factory.Pass()) {} |
| AndroidCdmFactory::~AndroidCdmFactory() {} |
| @@ -45,8 +48,12 @@ void AndroidCdmFactory::Create( |
| return; |
| } |
| + DCHECK(fetcher_factory_); |
| + scoped_ptr<ProvisionFetcher> fetcher = fetcher_factory_->CreateFetcher(); |
| + |
| scoped_refptr<MediaDrmBridge> cdm( |
| - MediaDrmBridge::Create(key_system, session_message_cb, session_closed_cb, |
| + MediaDrmBridge::Create(key_system, fetcher.Pass(), |
|
xhwang
2015/11/12 22:27:03
nit: you can pass fetcher_factory_->CreateFetcher(
Tima Vaisburd
2015/11/13 03:13:10
Used the callback method instead the factory.
|
| + session_message_cb, session_closed_cb, |
| legacy_session_error_cb, session_keys_change_cb, |
| session_expiration_update_cb)); |
| if (!cdm) { |