Get rid of KeepAlive. Quit shell when all urls run directly by Context are closed.

mojo/shell/shell_test_base.cc

Index: mojo/shell/shell_test_base.cc
diff --git a/mojo/shell/shell_test_base.cc b/mojo/shell/shell_test_base.cc
index da643a0d00ec2f2eb2323ffffcdb03800685436c..7c8a9af213151c36e5e08b4dbb00f1182b435e91 100644
--- a/mojo/shell/shell_test_base.cc
+++ b/mojo/shell/shell_test_base.cc
@@ -33,17 +33,6 @@ void ShellTestBase::SetUp() {
   test_server_->ServeFilesFromDirectory(service_dir);
 }
 
-ScopedMessagePipeHandle ShellTestBase::ConnectToServiceViaNetwork(
-    const GURL& application_url,
-    const std::string& service_name) {
-  shell_context_.mojo_url_resolver()->SetBaseURL(
-      test_server_->base_url());
-
-  return shell_context_.application_manager()
-      ->ConnectToServiceByName(application_url, service_name)
-      .Pass();
-}
-
 ScopedMessagePipeHandle ShellTestBase::ConnectToService(
     const GURL& application_url,
     const std::string& service_name) {
@@ -56,9 +45,18 @@ ScopedMessagePipeHandle ShellTestBase::ConnectToService(
   shell_context_.mojo_url_resolver()->SetBaseURL(
       net::FilePathToFileURL(service_dir));
 
-  return shell_context_.application_manager()
-      ->ConnectToServiceByName(application_url, service_name)
-      .Pass();
+  return shell_context_.ConnectToServiceByName(
+      application_url, service_name).Pass();
+}
+
+ScopedMessagePipeHandle ShellTestBase::ConnectToServiceViaNetwork(
+    const GURL& application_url,
+    const std::string& service_name) {
+  shell_context_.mojo_url_resolver()->SetBaseURL(
+      test_server_->base_url());
+
+  return shell_context_.ConnectToServiceByName(
+      application_url, service_name).Pass();
 }
 
 }  // namespace test