media: Quit MojoMediaApplication when no ServiceFactory service is bound.

mojo/shell/application_instance.cc

 // Copyright 2015 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 "mojo/shell/application_instance.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
 
 namespace mojo {
 namespace shell {
 
-ApplicationInstance::QueuedClientRequest::QueuedClientRequest() {
-}
+ApplicationInstance::QueuedClientRequest::QueuedClientRequest()
+    : originator(nullptr) {}
 
 ApplicationInstance::QueuedClientRequest::~QueuedClientRequest() {
 }
 
 ApplicationInstance::ApplicationInstance(
     ApplicationPtr application,
     ApplicationManager* manager,
     const Identity& identity,
     const CapabilityFilter& filter,
     const base::Closure& on_application_end)
@@ skipping 19 matching lines @@
 }
 
 void ApplicationInstance::ConnectToClient(
     ApplicationInstance* originator,
     const GURL& requested_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
     CapabilityFilterPtr filter) {
   if (queue_requests_) {
-    QueuedClientRequest* queued_request = new QueuedClientRequest;
+    QueuedClientRequest* queued_request = new QueuedClientRequest();
     queued_request->originator = originator;
     queued_request->requested_url = requested_url;
     queued_request->requestor_url = requestor_url;
     queued_request->services = services.Pass();
     queued_request->exposed_services = exposed_services.Pass();
-    queued_request->filter = filter.Pass(),
+    queued_request->filter = filter.Pass();
     queued_client_requests_.push_back(queued_request);
     return;
   }
 
   CallAcceptConnection(originator, requestor_url, services.Pass(),
                        exposed_services.Pass(), requested_url);
 }
 
 ApplicationInstance::AllowedInterfaces
     ApplicationInstance::GetAllowedInterfaces(
@@ skipping 62 matching lines @@
   queued_client_requests_.swap(queued_client_requests);
   auto manager = manager_;
   manager_->OnApplicationInstanceError(this);
   //|this| is deleted.
 
   // If any queued requests came to shell during time it was shutting down,
   // start them now.
   for (auto request : queued_client_requests) {
     mojo::URLRequestPtr url(mojo::URLRequest::New());
     url->url = mojo::String::From(request->requested_url.spec());
-    manager->ConnectToApplication(this, url.Pass(), std::string(),
+    manager->ConnectToApplication(nullptr, url.Pass(), std::string(),

[xhwang, 2015/07/25 08:12:42]

This fixes the crash in my test. But I am not sure whether it's the correct fix.

                                   request->requestor_url,
                                   request->services.Pass(),
                                   request->exposed_services.Pass(),
                                   request->filter.Pass(),
                                   base::Closure());
   }
   STLDeleteElements(&queued_client_requests);
 }
 
 void ApplicationInstance::OnQuitRequestedResult(bool can_quit) {
   if (can_quit)
     return;
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_) {
     CallAcceptConnection(request->originator,
                          request->requestor_url,
                          request->services.Pass(),
                          request->exposed_services.Pass(),
                          request->requested_url);
   }
   STLDeleteElements(&queued_client_requests_);
 }
 
 }  // namespace shell
 }  // namespace mojo