| 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 3e49190e1169ee3bd6b104a1403517a994e9c76d..8c2ea41e1d5a1d297d38e9ff489a3c8f6fa619fa 100644
|
| --- a/media/mojo/services/mojo_media_application.cc
|
| +++ b/media/mojo/services/mojo_media_application.cc
|
| @@ -37,7 +37,7 @@ bool MojoMediaApplication::OnConnect(const shell::Identity& remote_identity,
|
| }
|
|
|
| bool MojoMediaApplication::OnStop() {
|
| - mojo_media_client_->WillQuit();
|
| + mojo_media_client_.reset();
|
| return true;
|
| }
|
|
|
| @@ -49,6 +49,10 @@ void MojoMediaApplication::Create(const shell::Identity& remote_identity,
|
| void MojoMediaApplication::CreateServiceFactory(
|
| mojom::ServiceFactoryRequest request,
|
| shell::mojom::InterfaceProviderPtr remote_interfaces) {
|
| + // Ignore request if service has already stopped.
|
| + if (!mojo_media_client_)
|
| + return;
|
| +
|
| // The created object is owned by the pipe.
|
| new ServiceFactoryImpl(std::move(request), std::move(remote_interfaces),
|
| media_log_, ref_factory_.CreateRef(),
|
|
|