Destroy MojoMediaClient in MojoMediaApplication::OnStop().

media/mojo/services/mojo_media_application.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mojo/services/mojo_media_application.h"
 
 #include <utility>
 
 #include "media/base/media_log.h"
 #include "media/mojo/services/mojo_media_client.h"
@@ skipping 19 matching lines @@
   mojo_media_client_->Initialize();
 }
 
 bool MojoMediaApplication::OnConnect(const shell::Identity& remote_identity,
                                      shell::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::MediaService>(this);
   return true;
 }
 
 bool MojoMediaApplication::OnStop() {
-  mojo_media_client_->WillQuit();
+  mojo_media_client_.reset();
   return true;
 }
 
 void MojoMediaApplication::Create(const shell::Identity& remote_identity,
                                   mojom::MediaServiceRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 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(),
                          mojo_media_client_.get());
 }
 
 }  // namespace media