Revert 287680 "mojo: terminate apps if the shell goes away"

These tests started consistently failing: ConnectBasicNetwork, ConnectInvalidServiceNetwork.
(e.g http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/12739)

> mojo: terminate apps if the shell goes away
> 
> Each application <> shell connection is represented by a ShellImpl instance
> on the shell side. This CL makes the Application watch its ShellPtr for pipe
> errors so it can Quit() itself if the shell goes away (shell loop destroyed).
> 
> mojo_shell_tests starts using a new method to terminate all shell connections
> in this CL, and waits afterward until KeepAlive quits the loop signifying that
> all apps are gone. This is done prior to destroying the shell MessageLoop so
> that the test ensures apps have all died before the next test. In the future
> it would be a test failure if this wasn't a no-op, but we have things in the
> shell that don't quit themselves right now.
> 
> The shell itself won't wait around for apps to die (as of this CL), but
> ~MessageLoop will still send the message to Application sides that will quit.
> 
> ** NOTE ** This does not require an app build target to explicitly add magic
> *.cc files to their sources.  It requires selecting an appropriate
> mojo_application_{chromium, standalone} library akin to mojo_environment_*.
> We can possibly combine these two in the future.
> 
> BUG=394477
> 
> Review URL: https://codereview.chromium.org/394903005

TBR=tim@chromium.org

Review URL: https://codereview.chromium.org/443063003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287752 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 22 deletions

diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
index 00bfc7e..430d9b4 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -8,7 +8,7 @@
       'target_name': 'mojo_echo_client',
       'type': 'loadable_module',
       'dependencies': [
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
@@ -45,7 +45,7 @@
       'target_name': 'mojo_echo_service',
       'type': 'loadable_module',
       'dependencies': [
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
@@ -71,7 +71,7 @@
         # TODO(darin): we should not be linking against these libraries!
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
@@ -104,7 +104,7 @@
         '../cc/cc.gyp:cc',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_cc_support',
@@ -132,7 +132,7 @@
       'target_name': 'mojo_wget',
       'type': 'loadable_module',
       'dependencies': [
-        'mojo_base.gyp:mojo_application_standalone',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_standalone',
         'mojo_base.gyp:mojo_utility',
@@ -171,7 +171,7 @@
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_utility',
@@ -197,7 +197,7 @@
         '../ppapi/ppapi.gyp:ppapi_c',
         '../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
         '../ui/events/events.gyp:events_base',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_geometry_bindings',
@@ -293,7 +293,7 @@
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_system_impl',
@@ -348,7 +348,7 @@
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_base.gyp:mojo_application_chromium',
+        'mojo_base.gyp:mojo_application',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_system_impl',
@@ -383,7 +383,7 @@
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_aura_support',
@@ -402,7 +402,7 @@
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_view_manager_bindings',
             '<(mojo_system_for_loadable_module)',
@@ -429,7 +429,7 @@
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_aura_support',
@@ -464,7 +464,7 @@
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_base.gyp:mojo_utility',
@@ -495,7 +495,7 @@
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_aura_support',
@@ -561,7 +561,7 @@
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_base.gyp:mojo_environment_chromium',
@@ -593,7 +593,7 @@
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_base.gyp:mojo_utility',
@@ -617,7 +617,7 @@
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_base.gyp:mojo_utility',
@@ -641,7 +641,7 @@
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/views/views.gyp:views',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_input_events_lib',
             'mojo_media_viewer_bindings',
@@ -661,7 +661,7 @@
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_core_window_manager_lib',
             'mojo_view_manager_lib',
@@ -677,7 +677,7 @@
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_view_manager_bindings',
             '<(mojo_system_for_loadable_module)',
@@ -692,7 +692,7 @@
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_chromium',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_core_window_manager_bindings',
             'mojo_view_manager_lib',
@@ -712,7 +712,7 @@
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_application_standalone',
+            'mojo_base.gyp:mojo_application',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_environment_standalone',
             'mojo_base.gyp:mojo_utility',