Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Unified Diff: media/mojo/services/android_mojo_media_client.cc

Issue 1473233005: Revert of media: Add ProvisionFetcher mojo interface and implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/default_mojo_media_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 964db0670fad10c59d96d7aea3c580c588338791..8bc09e108bd4f10f1044a88376324fcb01eeb846 100644
--- a/media/mojo/services/android_mojo_media_client.cc
+++ b/media/mojo/services/android_mojo_media_client.cc
@@ -8,21 +8,27 @@
#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 {
-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(std::move(provision_fetcher_ptr)));
+// 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, "");
+ };
+};
+
+scoped_ptr<ProvisionFetcher> CreateDummyProvisionFetcher() {
+ return make_scoped_ptr(new DummyProvisionFetcher());
}
} // namespace (anonymous)
@@ -31,10 +37,9 @@
public:
AndroidMojoMediaClient() {}
- scoped_ptr<CdmFactory> CreateCdmFactory(
- mojo::ServiceProvider* service_provider) override {
- return make_scoped_ptr(new AndroidCdmFactory(
- base::Bind(&CreateProvisionFetcher, service_provider)));
+ scoped_ptr<CdmFactory> CreateCdmFactory() override {
+ return make_scoped_ptr(
+ new AndroidCdmFactory(base::Bind(&CreateDummyProvisionFetcher)));
}
private:
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/default_mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698