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

Unified Diff: media/mojo/services/service_factory_impl.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/mojo_provision_fetcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/service_factory_impl.cc
diff --git a/media/mojo/services/service_factory_impl.cc b/media/mojo/services/service_factory_impl.cc
index eb59c8f0144b16a7b7f59764faffb6fc34d88a0d..fcbbc61432407a8cf9b9521603bd3a5fc5981b13 100644
--- a/media/mojo/services/service_factory_impl.cc
+++ b/media/mojo/services/service_factory_impl.cc
@@ -12,7 +12,6 @@
#include "media/mojo/services/mojo_media_client.h"
#include "media/mojo/services/mojo_renderer_service.h"
#include "mojo/application/public/cpp/app_lifetime_helper.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
namespace media {
@@ -21,10 +20,10 @@
mojo::ServiceProvider* service_provider,
scoped_refptr<MediaLog> media_log,
scoped_ptr<mojo::AppRefCount> parent_app_refcount)
- : binding_(this, std::move(request)),
+ : binding_(this, request.Pass()),
service_provider_(service_provider),
media_log_(media_log),
- parent_app_refcount_(std::move(parent_app_refcount)) {
+ parent_app_refcount_(parent_app_refcount.Pass()) {
DVLOG(1) << __FUNCTION__;
}
@@ -37,14 +36,14 @@
mojo::InterfaceRequest<interfaces::Renderer> request) {
// The created object is owned by the pipe.
new MojoRendererService(cdm_service_context_.GetWeakPtr(),
- GetRendererFactory(), media_log_, std::move(request));
+ GetRendererFactory(), media_log_, request.Pass());
}
void ServiceFactoryImpl::CreateCdm(
mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request) {
// The created object is owned by the pipe.
new MojoCdmService(cdm_service_context_.GetWeakPtr(), service_provider_,
- GetCdmFactory(), std::move(request));
+ GetCdmFactory(), request.Pass());
}
RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
@@ -56,7 +55,7 @@
CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
if (!cdm_factory_)
- cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory(service_provider_);
+ cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory();
return cdm_factory_.get();
}
« no previous file with comments | « media/mojo/services/mojo_provision_fetcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698