| Index: media/base/android/browser_cdm_factory_android.cc
|
| diff --git a/media/base/android/browser_cdm_factory_android.cc b/media/base/android/browser_cdm_factory_android.cc
|
| index 66912bc89df35f0c743790a33ab75faaeb197af2..83940d4f6ba66d6caa1d41c321a9feae5711e057 100644
|
| --- a/media/base/android/browser_cdm_factory_android.cc
|
| +++ b/media/base/android/browser_cdm_factory_android.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "media/base/android/media_drm_bridge.h"
|
| #include "media/base/media_switches.h"
|
| +#include "media/base/provision_fetcher.h"
|
| #include "third_party/widevine/cdm/widevine_cdm_common.h"
|
|
|
| namespace media {
|
| @@ -16,6 +17,7 @@ namespace media {
|
| ScopedBrowserCdmPtr BrowserCdmFactoryAndroid::CreateBrowserCdm(
|
| const std::string& key_system,
|
| bool use_hw_secure_codecs,
|
| + scoped_ptr<ProvisionFetcher> provision_fetcher,
|
| const SessionMessageCB& session_message_cb,
|
| const SessionClosedCB& session_closed_cb,
|
| const LegacySessionErrorCB& legacy_session_error_cb,
|
| @@ -26,10 +28,10 @@ ScopedBrowserCdmPtr BrowserCdmFactoryAndroid::CreateBrowserCdm(
|
| return ScopedBrowserCdmPtr();
|
| }
|
|
|
| - ScopedMediaDrmBridgePtr cdm(
|
| - MediaDrmBridge::Create(key_system, session_message_cb, session_closed_cb,
|
| - legacy_session_error_cb, session_keys_change_cb,
|
| - session_expiration_update_cb));
|
| + ScopedMediaDrmBridgePtr cdm(MediaDrmBridge::Create(
|
| + key_system, provision_fetcher.Pass(), session_message_cb,
|
| + session_closed_cb, legacy_session_error_cb, session_keys_change_cb,
|
| + session_expiration_update_cb));
|
| if (!cdm) {
|
| NOTREACHED() << "MediaDrmBridge cannot be created for " << key_system;
|
| return ScopedBrowserCdmPtr();
|
|
|