| Index: media/base/browser_cdm_factory.h
|
| diff --git a/media/base/browser_cdm_factory.h b/media/base/browser_cdm_factory.h
|
| index 99525a79b2a5fdda6bc07e96708a3b92bca19e9c..64b43a9b41f19fe444dcf1dfef35d4d23eb9e32e 100644
|
| --- a/media/base/browser_cdm_factory.h
|
| +++ b/media/base/browser_cdm_factory.h
|
| @@ -11,9 +11,12 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "media/base/browser_cdm.h"
|
| #include "media/base/media_export.h"
|
| +#include "media/base/provision_fetcher.h"
|
|
|
| namespace media {
|
|
|
| +class ProvisionFetcher;
|
| +
|
| class MEDIA_EXPORT BrowserCdmFactory {
|
| public:
|
| BrowserCdmFactory() {}
|
| @@ -22,6 +25,7 @@ class MEDIA_EXPORT BrowserCdmFactory {
|
| virtual ScopedBrowserCdmPtr 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,
|
| @@ -34,16 +38,19 @@ class MEDIA_EXPORT BrowserCdmFactory {
|
|
|
| // Provides a factory for creating BrowserCdm instances. There is only one
|
| // BrowserCdmFactory per process.
|
| -void SetBrowserCdmFactory(BrowserCdmFactory* factory);
|
| +void MEDIA_EXPORT SetBrowserCdmFactory(BrowserCdmFactory* factory);
|
|
|
| // Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be
|
| // created.
|
| // |use_hw_secure_codecs| indicates that the CDM should be configured to use
|
| // hardware-secure codecs (for platforms that support it).
|
| +// |render_process_id| is used to get the URL context if the platform requires
|
| +// HTTP communication for provisioning.
|
| // TODO(xhwang): Add ifdef for IPC based CDM.
|
| ScopedBrowserCdmPtr MEDIA_EXPORT
|
| 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,
|
|
|