Revert of mojo: Delay ApplicationTestBase shell disconnection.

mojo/tools/data/apptests

 # This file contains a list of Mojo gtest unit tests.
 #
 # This must be valid Python. It may use the |config| global that will be a
 # mopy.config.Config object, and must set a |tests| global that will contain the
 # list of tests to run.
 #
 # The entries in |tests| are dictionaries of the following form:
 #   {
 #     # Required URL for apptest.
 #     'test': 'mojo:test_app_url',
@@ skipping 47 matching lines @@
     {
       'test': 'mojo:mash_wm_apptests',
       'type': 'gtest_isolated',
       'args': ['--use-x11-test-config',
                '--override-use-gl-with-osmesa-for-tests']
     },
     {
       'test': 'mojo:media_apptests',
       'type': 'gtest_isolated',
     },
-    {
-      'test': 'mojo:media_pipeline_integration_apptests',
-      'type': 'gtest_isolated',
-    },
+    # TODO(media): these tests fail in debug, which has no bot-coverage.
+    # http://crbug.com/587523
+#    {
+#      'test': 'mojo:media_pipeline_integration_apptests',
+#      'type': 'gtest_isolated',
+#    },
     # TODO(rockot): Flaky. Re-enable when brokering is sorted out.
     # http://crbug.com/569367.
 #    {
 #      'test': 'mojo:mojo_shell_apptests',
 #      'type': 'gtest_isolated',
 #    },
     # TODO(crbug.com/560626): Fix and enable mus_apptests on Android.
     mus_apptests,
     # TODO(sky): enable when works (http://crbug.com/577274 and likely
     # http://crbug.com/569367).
 #    {
 #      'test': 'mojo:views_apptests',
 #      'type': 'gtest_isolated',
 #      'args': ['--use-x11-test-config',
 #               '--override-use-gl-with-osmesa-for-tests', '--enable-logging']
 #    },
     {
       'test': 'mojo:leveldb_apptests',
       'type': 'gtest_isolated',
     }
   ]