Chromium Code Reviews| Index: chrome/browser/media/android/cdm/media_drm_credential_manager.cc |
| diff --git a/chrome/browser/media/android/cdm/media_drm_credential_manager.cc b/chrome/browser/media/android/cdm/media_drm_credential_manager.cc |
| index 26cbeca45035972ecee2839194a45eef8c5042f2..0bf5386f0dae21a501d74363fe283a9aa7f7e0a1 100644 |
| --- a/chrome/browser/media/android/cdm/media_drm_credential_manager.cc |
| +++ b/chrome/browser/media/android/cdm/media_drm_credential_manager.cc |
| @@ -11,8 +11,11 @@ |
| #include "base/location.h" |
| #include "base/single_thread_task_runner.h" |
| #include "base/thread_task_runner_handle.h" |
| +#include "chrome/browser/browser_process.h" |
| +#include "content/public/browser/android/provision_fetcher_factory.h" |
| #include "jni/MediaDrmCredentialManager_jni.h" |
| #include "media/base/android/media_drm_bridge.h" |
| +#include "media/base/android/provision_fetcher.h" |
| #include "url/gurl.h" |
| #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
| @@ -31,7 +34,11 @@ void MediaDrmCredentialManagerCallback( |
| } // namespace |
| -MediaDrmCredentialManager::MediaDrmCredentialManager() {} |
| +MediaDrmCredentialManager::MediaDrmCredentialManager() { |
| + DCHECK(g_browser_process); |
| + provision_fetcher_factory_.reset(content::CreateURLProvisionFetcherFactory( |
| + g_browser_process->system_request_context())); |
|
xhwang
2015/11/12 22:27:03
Did you try this and does it work? I don't see why
Tima Vaisburd
2015/11/13 03:13:10
Yes, I tested and it worked for me.
|
| +} |
| MediaDrmCredentialManager::~MediaDrmCredentialManager() {} |
| @@ -89,8 +96,11 @@ void MediaDrmCredentialManager::OnResetCredentialsCompleted( |
| // TODO(ddorwin): The key system should be passed in. http://crbug.com/459400 |
| bool MediaDrmCredentialManager::ResetCredentialsInternal( |
| SecurityLevel security_level) { |
| - media_drm_bridge_ = |
| - media::MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem); |
| + scoped_ptr<media::ProvisionFetcher> provision_fetcher = |
| + provision_fetcher_factory_->CreateFetcher(); |
| + |
| + media_drm_bridge_ = media::MediaDrmBridge::CreateWithoutSessionSupport( |
| + kWidevineKeySystem, provision_fetcher.Pass()); |
|
xhwang
2015/11/12 22:27:03
nit: you can just put provision_fetcher_factory_->
xhwang
2015/11/12 22:27:03
Actually, if we have something like content::Creat
Tima Vaisburd
2015/11/13 03:13:10
Done.
|
| if (!media_drm_bridge_) |
| return false; |