Index: media/mojo/services/mojo_media_application.cc |
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc |
index ccc195bc346a16695786c0f26dc2e0afa22c8042..e2b0e6ef20a884c08df0c022d131488a81c7903d 100644 |
--- a/media/mojo/services/mojo_media_application.cc |
+++ b/media/mojo/services/mojo_media_application.cc |
@@ -30,9 +30,11 @@ scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() { |
return scoped_ptr<mojo::ApplicationDelegate>(new MojoMediaApplication()); |
} |
-MojoMediaApplication::MojoMediaApplication() {} |
+MojoMediaApplication::MojoMediaApplication() { |
+} |
-MojoMediaApplication::~MojoMediaApplication() {} |
+MojoMediaApplication::~MojoMediaApplication() { |
+} |
void MojoMediaApplication::Initialize(mojo::ApplicationImpl* app) { |
app_impl_ = app; |
@@ -54,12 +56,16 @@ bool MojoMediaApplication::ConfigureIncomingConnection( |
return true; |
} |
+void MojoMediaApplication::Quit() { |
+ app_impl_ = nullptr; |
+} |
+ |
void MojoMediaApplication::Create( |
mojo::ApplicationConnection* connection, |
mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) { |
// The created object is owned by the pipe. |
- MojoCdmService* mojo_cdm_service = |
- new MojoCdmService(&cdm_service_context_, request.Pass()); |
+ MojoCdmService* mojo_cdm_service = new MojoCdmService( |
+ &cdm_service_context_, connection->GetServiceProvider(), request.Pass()); |
// Passing unretained |this| is safe here because the app is guaranteed to |
// outlive all services. |
@@ -86,10 +92,6 @@ void MojoMediaApplication::Create( |
idle_timeout_callback_.Cancel(); |
} |
-void MojoMediaApplication::Quit() { |
- app_impl_ = nullptr; |
-} |
- |
void MojoMediaApplication::StartIdleTimer() { |
// Passing unretained |app_impl_| is safe here because |app_impl_| is |
// guaranteed to outlive |this|, and the callback is canceled if |this| is |