Chromium Code Reviews| Index: media/mojo/services/android_mojo_media_client.cc |
| diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc |
| index 8bc09e108bd4f10f1044a88376324fcb01eeb846..2fdb0aa48e455a09bb16433aa2d83b6fe99aed62 100644 |
| --- a/media/mojo/services/android_mojo_media_client.cc |
| +++ b/media/mojo/services/android_mojo_media_client.cc |
| @@ -8,27 +8,21 @@ |
| #include "media/base/android/android_cdm_factory.h" |
| #include "media/base/bind_to_current_loop.h" |
| #include "media/base/media.h" |
| +#include "media/mojo/interfaces/provision_fetcher.mojom.h" |
| +#include "media/mojo/services/mojo_provision_fetcher.h" |
| +#include "mojo/application/public/cpp/connect.h" |
| namespace media { |
| namespace internal { |
| -namespace { |
| -// A temporary solution until we pass the proper CDM provision fetcher. |
| -class DummyProvisionFetcher : public ProvisionFetcher { |
| - public: |
| - DummyProvisionFetcher() {} |
| - ~DummyProvisionFetcher() final {} |
| - |
| - // Retrieve() always fails for this fetcher. |
| - void Retrieve(const std::string& default_url, |
| - const std::string& request_data, |
| - const ResponseCB& response_cb) final { |
| - BindToCurrentLoop(response_cb).Run(false, ""); |
| - }; |
| -}; |
| +namespace { |
| -scoped_ptr<ProvisionFetcher> CreateDummyProvisionFetcher() { |
| - return make_scoped_ptr(new DummyProvisionFetcher()); |
| +scoped_ptr<ProvisionFetcher> CreateProvisionFetcher( |
| + mojo::ServiceProvider* service_provider) { |
| + interfaces::ProvisionFetcherPtr provision_fetcher_ptr; |
| + mojo::ConnectToService(service_provider, &provision_fetcher_ptr); |
| + return make_scoped_ptr( |
| + new MojoProvisionFetcher(provision_fetcher_ptr.Pass())); |
| } |
| } // namespace (anonymous) |
| @@ -37,9 +31,10 @@ class AndroidMojoMediaClient : public PlatformMojoMediaClient { |
| public: |
| AndroidMojoMediaClient() {} |
| - scoped_ptr<CdmFactory> CreateCdmFactory() override { |
| - return make_scoped_ptr( |
| - new AndroidCdmFactory(base::Bind(&CreateDummyProvisionFetcher))); |
| + scoped_ptr<CdmFactory> CreateCdmFactory( |
| + mojo::ServiceProvider* service_provider) override { |
| + return make_scoped_ptr(new AndroidCdmFactory( |
| + base::Bind(&CreateProvisionFetcher, service_provider))); |
|
xhwang
2015/11/20 22:28:34
timav: Now when we create a MediaDrmBridge, we'll
|
| } |
| private: |