4 files changed, 6 insertions, 7 deletions
diff --git a/mojo/services/network/network_service_delegate.cc b/mojo/services/network/network_service_delegate.cc
index 1970928..b257331 100644
--- a/mojo/services/network/network_service_delegate.cc
+++ b/mojo/services/network/network_service_delegate.cc
@@ -78,10 +78,6 @@ bool NetworkServiceDelegate::AcceptConnection(Connection* connection) {
   return true;
 }
 
-void NetworkServiceDelegate::ShellConnectionLost() {
-  base::MessageLoop::current()->QuitWhenIdle();
-}
-
 void NetworkServiceDelegate::Create(Connection* connection,
                                     InterfaceRequest<NetworkService> request) {
   new NetworkServiceImpl(ref_factory_.CreateRef(), std::move(request));
diff --git a/mojo/services/network/network_service_delegate.h b/mojo/services/network/network_service_delegate.h
index 8997097..7098939 100644
--- a/mojo/services/network/network_service_delegate.h
+++ b/mojo/services/network/network_service_delegate.h
@@ -38,7 +38,6 @@ class NetworkServiceDelegate : public ShellClient,
   void Initialize(Connector* connector, const Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(Connection* connection) override;
-  void ShellConnectionLost() override;
 
   // InterfaceFactory<NetworkService> implementation.
   void Create(Connection* connection,
diff --git a/mojo/services/tracing/tracing_app.cc b/mojo/services/tracing/tracing_app.cc
index 65b4421..d921a6d 100644
--- a/mojo/services/tracing/tracing_app.cc
+++ b/mojo/services/tracing/tracing_app.cc
@@ -42,8 +42,12 @@ bool TracingApp::AcceptConnection(mojo::Connection* connection) {
   return true;
 }
 
-void TracingApp::ShellConnectionLost() {
+bool TracingApp::ShellConnectionLost() {
+  // TODO(beng): This is only required because TracingApp isn't run by
+  // ApplicationRunner - instead it's launched automatically by the standalone
+  // shell. It shouldn't be.
   base::MessageLoop::current()->QuitWhenIdle();
+  return false;
 }
 
 void TracingApp::Create(mojo::Connection* connection,
diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h
index 17f4132..eb5934a 100644
--- a/mojo/services/tracing/tracing_app.h
+++ b/mojo/services/tracing/tracing_app.h
@@ -34,7 +34,7 @@ class TracingApp
  private:
   // mojo::ShellClient implementation.
   bool AcceptConnection(mojo::Connection* connection) override;
-  void ShellConnectionLost() override;
+  bool ShellConnectionLost() override;
 
   // mojo::InterfaceFactory<TraceCollector> implementation.
   void Create(mojo::Connection* connection,