Merge lp:~ted/ubuntu-app-launch/rm-rf-upstart into lp:ubuntu-app-launch

[Ted Gould]

Remove Upstart

[lp:~ted/ubuntu-app-launch/rm-rf-upstart]

295. By Ted Gould on 2017-02-22

Merge the jobs helper branch

296. By Ted Gould on 2017-02-22

Remove the untrusted helper type util

297. By Ted Gould on 2017-02-23

Test location updates

298. By Ted Gould on 2017-02-23

Update to future trunk

299. By Ted Gould on 2017-02-25

Update to jobs helpers

300. By Ted Gould on 2017-03-14

Grabbing the jobs-helper updates

301. By Ted Gould on 2017-03-14

Demangler support

302. By Ted Gould on 2017-03-14

Remove upstart dirs and make sure we have a dbus-user-session

303. By Ted Gould on 2017-03-14

Merge future trunk

304. By Ted Gould on 2017-03-14

Remove a few upstart headers

305. By Ted Gould on 2017-03-14

Remove old environment variable helpers

306. By Ted Gould on 2017-03-18

Drop CG Manager variables

307. By Ted Gould on 2017-03-18

Grab upstream fixes

308. By Ted Gould on 2017-03-18

Remove Upstart objects from docs

309. By Ted Gould on 2017-03-21

Merge updated jobs-helpers

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-26 20:05:22 +0000
+++ CMakeLists.txt	2017-02-22 21:41:30 +0000
@@ -79,9 +79,6 @@
 pkg_check_modules(CLICK REQUIRED click-0.4>=0.4.18)
 include_directories(${CLICK_INCLUDE_DIRS})
 
-pkg_check_modules(LIBUPSTART REQUIRED libupstart)
-include_directories(${LIBUPSTART_INCLUDE_DIRS})
-
 pkg_check_modules(DBUS REQUIRED dbus-1)
 include_directories(${DBUS_INCLUDE_DIRS})
 
@@ -130,70 +127,6 @@
 install(TARGETS desktop-hook RUNTIME DESTINATION "${pkglibexecdir}")
 
 ####################
-# exec-line-exec
-####################
-
-add_lttng_gen_tp(NAME exec-line-exec-trace)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_executable(exec-line-exec exec-line-exec.c "${CMAKE_CURRENT_BINARY_DIR}/exec-line-exec-trace.c")
-set_target_properties(exec-line-exec PROPERTIES OUTPUT_NAME "exec-line-exec")
-target_link_libraries(exec-line-exec helpers ${LTTNG_LIBRARIES})
-install(TARGETS exec-line-exec RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# zg-report-app
-####################
-
-add_executable(zg-report-app zg-report-app.c)
-set_target_properties(zg-report-app PROPERTIES OUTPUT_NAME "zg-report-app")
-target_link_libraries(zg-report-app ubuntu-launcher ${ZEITGEIST_LIBRARIES} ${GOBJECT2_LIBRARIES} ${GLIB2_LIBRARIES})
-install(TARGETS zg-report-app RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# application-job
-####################
-
-add_executable(application-job application-job.c)
-set_target_properties(application-job PROPERTIES OUTPUT_NAME "application-job")
-target_link_libraries(application-job ubuntu-launcher)
-install(TARGETS application-job RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# application-failed
-####################
-
-add_executable(application-failed application-failed.c)
-set_target_properties(application-failed PROPERTIES OUTPUT_NAME "application-failed")
-target_link_libraries(application-failed ${GIO2_LIBRARIES})
-install(TARGETS application-failed RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# xmir-helper
-####################
-
-add_executable(xmir-helper xmir-helper.c)
-set_target_properties(xmir-helper PROPERTIES OUTPUT_NAME "xmir-helper")
-install(TARGETS xmir-helper RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# untrusted-helper-type-end
-####################
-
-add_executable(untrusted-helper-type-end untrusted-helper-type-end.c)
-set_target_properties(untrusted-helper-type-end PROPERTIES OUTPUT_NAME "untrusted-helper-type-end")
-target_link_libraries(untrusted-helper-type-end ubuntu-launcher)
-install(TARGETS untrusted-helper-type-end RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# cgroup-reap-all
-####################
-
-add_executable(cgroup-reap-all cgroup-reap-all.c)
-set_target_properties(cgroup-reap-all PROPERTIES OUTPUT_NAME "cgroup-reap-all")
-target_link_libraries(cgroup-reap-all helpers)
-install(TARGETS cgroup-reap-all RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
 # oom-adjust-setuid-helper
 ####################
 
@@ -202,48 +135,15 @@
 install(TARGETS oom-adjust-setuid-helper RUNTIME DESTINATION "${pkglibexecdir}")
 
 ####################
-# socket-demangler
-####################
-
-add_executable(socket-demangler-helper socket-demangler.c)
-set_target_properties(socket-demangler-helper PROPERTIES OUTPUT_NAME "socket-demangler")
-target_link_libraries(socket-demangler-helper ${GIO2_LIBRARIES})
-install(TARGETS socket-demangler-helper RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# snappy-xmir
-####################
-
-####################
-# NOTE: This only can link to libraries that are in
-# the base UBUNTU CORE image. Which is basically libc
-# and not much else. Don't add libs.
-####################
-
-add_executable(snappy-xmir snappy-xmir.c)
-set_target_properties(snappy-xmir PROPERTIES OUTPUT_NAME "snappy-xmir")
-install(TARGETS snappy-xmir RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
-
-####################
-# snappy-xmir-envvars
-####################
-
-add_executable(snappy-xmir-envvars snappy-xmir-envvars.c)
-set_target_properties(snappy-xmir-envvars PROPERTIES OUTPUT_NAME "snappy-xmir-envvars")
-# No libs, otherwise we have to worry about how to handle finding them
-install(TARGETS snappy-xmir-envvars RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
-
-
-####################
 # ubuntu-app-launch-desktop.click-hook
 ####################
 
 configure_file("ubuntu-app-launch-desktop.click-hook.in" "${CMAKE_CURRENT_SOURCE_DIR}/debian/ubuntu-app-launch-desktop.click-hook" @ONLY)
 
 add_subdirectory(libubuntu-app-launch)
-add_subdirectory(upstart-jobs)
 add_subdirectory(tools)
 add_subdirectory(ubuntu-app-test)
+add_subdirectory(utils)
 
 # testing & coverage
 if (${enable_tests})
@@ -265,7 +165,6 @@
   TESTS
   	application-icon-finder-test
 	application-info-desktop-test
-	cgroup-reap-test
 	exec-util-test
 	failure-test
 	helper-test

=== removed file 'application-failed.c'
--- application-failed.c	2016-12-14 21:11:09 +0000
+++ application-failed.c	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include <gio/gio.h>
-
-int
-main (int argc, char * argv[])
-{
-	const gchar * job = g_getenv("JOB");
-	g_return_val_if_fail(job != NULL, -1);
-
-	const gchar * instance = g_getenv("INSTANCE");
-	g_return_val_if_fail(instance != NULL, -1);
-
-	gboolean crashed = FALSE;
-	if (g_getenv("EXIT_STATUS") != NULL || g_getenv("EXIT_SIGNAL") != NULL) {
-		crashed = TRUE;
-	}
-
-	gchar * appid = g_strdup(instance);
-	gchar * lasthyphenstanding = NULL;
-	if (g_strcmp0(job, "application-legacy") == 0
-			|| g_strcmp0(job, "application-snap") == 0) {
-		lasthyphenstanding = g_strrstr(appid, "-");
-		if (lasthyphenstanding != NULL) {
-			lasthyphenstanding[0] = '\0';
-		} else {
-			g_warning("Legacy job instance '%s' is missing a hyphen", appid);
-		}
-	}
-
-	if (lasthyphenstanding == NULL) {
-		lasthyphenstanding = "";
-	} else {
-		lasthyphenstanding++;
-	}
-
-	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(bus != NULL, -1);
-
-	GError * error = NULL;
-	g_dbus_connection_emit_signal(bus,
-		NULL, /* destination */
-		"/", /* path */
-		"com.canonical.UbuntuAppLaunch",
-		"ApplicationFailed",
-		g_variant_new("(sss)", appid, lasthyphenstanding, crashed ? "crash" : "start-failure"),
-		&error);
-
-	g_debug("Emitting failed event '%s' for app '%s'", crashed ? "crash" : "start-failure", appid);
-
-	if (error != NULL) {
-		g_warning("Unable to emit signal: %s", error->message);
-		g_error_free(error);
-		return -1;
-	}
-
-	g_dbus_connection_flush_sync(bus, NULL, NULL);
-	g_object_unref(bus);
-	g_free(appid);
-
-	return 0;
-}

=== removed file 'application-job.c'
--- application-job.c	2014-04-30 16:34:06 +0000
+++ application-job.c	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include <gio/gio.h>
-#include "libubuntu-app-launch/ubuntu-app-launch.h"
-
-int retval = 0;
-const gchar * global_appid;
-
-static void
-app_started (const gchar * appid, gpointer user_data)
-{
-	if (g_strcmp0(appid, global_appid) != 0)
-		return;
-	g_debug("Application Started: %s", appid);
-	g_main_loop_quit((GMainLoop *)user_data);
-}
-
-static void
-app_focus (const gchar * appid, gpointer user_data)
-{
-	if (g_strcmp0(appid, global_appid) != 0)
-		return;
-	g_debug("Application Focused");
-	g_main_loop_quit((GMainLoop *)user_data);
-}
-
-static void
-app_failed (const gchar * appid, UbuntuAppLaunchAppFailed failure_type, gpointer user_data)
-{
-	if (g_strcmp0(appid, global_appid) != 0)
-		return;
-	g_warning("Application Startup Failed");
-	retval = 1;
-	g_main_loop_quit((GMainLoop *)user_data);
-}
-
-/* A fallback so that we can see what is going on.  The job can not always signal
-   that it has been started, and thus we wouldn't quit.  Which would be a bad thing. */
-static gboolean
-timeout_check (gpointer user_data)
-{
-	g_debug("Timeout reached");
-	g_main_loop_quit((GMainLoop *)user_data);
-	return TRUE; /* Keep the source connected to avoid the disconnect error */
-}
-
-int
-main (int argc, char * argv[])
-{
-	GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(con != NULL, 1);
-
-	global_appid = g_getenv("APP_ID");
-	g_return_val_if_fail(global_appid != NULL, 1);
-
-	const gchar * uris_str = g_getenv("APP_URIS");
-	gchar ** uris = NULL;
-	if (uris_str != NULL) {
-		GError * error = NULL;
-		gint uri_count = 0;
-		g_shell_parse_argv(uris_str, &uri_count, &uris, &error);
-
-		if (error != NULL) {
-			g_warning("Unable to parse uris '%s': %s", uris_str, error->message);
-			g_error_free(error);
-		} else {
-			g_debug("Got %d URIs", uri_count);
-		}
-	}
-
-	GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
-
-	ubuntu_app_launch_observer_add_app_started(app_started, mainloop);
-	ubuntu_app_launch_observer_add_app_focus(app_focus, mainloop);
-	ubuntu_app_launch_observer_add_app_failed(app_failed, mainloop);
-
-	guint timer = g_timeout_add_seconds(1, timeout_check, mainloop);
-
-	g_debug("Start Application: %s", global_appid);
-	g_return_val_if_fail(ubuntu_app_launch_start_application(global_appid, (const gchar * const *)uris), -1);
-	g_strfreev(uris);
-
-	g_debug("Wait for results");
-	g_main_loop_run(mainloop);
-
-	g_source_remove(timer);
-
-	ubuntu_app_launch_observer_delete_app_started(app_started, mainloop);
-	ubuntu_app_launch_observer_delete_app_focus(app_focus, mainloop);
-	ubuntu_app_launch_observer_delete_app_failed(app_failed, mainloop);
-
-	g_main_loop_unref(mainloop);
-	g_object_unref(con);
-
-	return retval;
-}

=== removed file 'cgroup-reap-all.c'
--- cgroup-reap-all.c	2014-11-20 20:33:59 +0000
+++ cgroup-reap-all.c	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include "helpers.h"
-
-int kill (pid_t pid, int signal);
-pid_t getpgid (pid_t);
-
-int
-main (int argc, char * argv[])
-{
-	/* Break off a new process group */
-	setpgid(0, 0);
-
-	GDBusConnection * cgmanager = cgroup_manager_connection();
-	g_return_val_if_fail(cgmanager != NULL, -1);
-
-	GPid selfpid = getpid();
-	GPid parentpid = getppid();
-
-	/* We're gonna try to kill things forever, literally. It's important
-	   enough that we can't consider failure an option. */
-	gboolean killed = TRUE;
-	while (killed) {
-		GList * pidlist = pids_from_cgroup(cgmanager, NULL, NULL);
-		GList * head;
-
-		killed = FALSE;
-
-		for (head = pidlist; head != NULL; head = g_list_next(head)) {
-			GPid pid = GPOINTER_TO_INT(head->data);
-
-			/* We don't want to kill ourselves, or if we're being executed by
-			   a script, that script, either. We also don't want things in our
-			   process group which we forked at the opening */
-			if (pid != selfpid && pid != parentpid && getpgid(pid) != selfpid) {
-				g_debug("Killing pid: %d", pid);
-				kill(pid, SIGKILL);
-				killed = TRUE;
-			}
-		}
-
-		g_list_free(pidlist);
-	}
-
-	cgroup_manager_unref(cgmanager);
-
-	return 0;
-}

=== modified file 'debian/control'
--- debian/control	2017-01-19 18:39:44 +0000
+++ debian/control	2017-02-22 21:41:30 +0000
@@ -22,18 +22,14 @@
                liblibertine-dev,
                liblttng-ust-dev,
                libmirclient-dev (>= 0.5),
-               libnih-dbus-dev,
-               libnih-dev,
                libproperties-cpp-dev,
 # For ABI check to distro version
 # Make sure to set DEB_BUILD_PROFILES when bootstrapping
                libubuntu-app-launch2-dev <!stage1>,
-               libupstart-dev,
                libwhoopsie-dev (>= 0.2.52),
                libzeitgeist-2.0-dev,
                gobject-introspection,
                python3-dbusmock,
-               upstart (>= 1.13),
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/ubuntu-app-launch
 # If you aren't a member of ~indicator-applet-developers but need to upload packaging changes,
@@ -45,10 +41,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         cgmanager,
          click-apparmor,
-         libpam-cgfs | libpam-cgm | cgmanager (<< 0.37),
-         upstart (>= 1.13),
          xmir [amd64 armhf i386],
          zeitgeist-core,
 Replaces: upstart-app-launch

=== removed file 'exec-line-exec-trace.tp'
--- exec-line-exec-trace.tp	2014-09-17 14:11:59 +0000
+++ exec-line-exec-trace.tp	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-
-TRACEPOINT_EVENT(ubuntu_app_launch, exec_start,
-	TP_ARGS(const char *, appid),
-	TP_FIELDS(
-		ctf_string(appid, appid)
-	)
-)
-TRACEPOINT_EVENT(ubuntu_app_launch, exec_parse_complete,
-	TP_ARGS(const char *, appid),
-	TP_FIELDS(
-		ctf_string(appid, appid)
-	)
-)
-TRACEPOINT_EVENT(ubuntu_app_launch, exec_pre_exec,
-	TP_ARGS(const char *, appid),
-	TP_FIELDS(
-		ctf_string(appid, appid)
-	)
-)

=== removed file 'exec-line-exec.c'
--- exec-line-exec.c	2015-06-30 20:42:24 +0000
+++ exec-line-exec.c	1970-01-01 00:00:00 +0000
@@ -1,170 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include "exec-line-exec-trace.h"
-#include "helpers.h"
-#include "ual-tracepoint.h"
-
-int
-main (int argc, char * argv[])
-{
-	/* Make sure we have work to do */
-	/* This string is quoted using desktop file quoting:
-	   http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables */
-	const gchar * app_exec = g_getenv("APP_EXEC");
-	if (app_exec == NULL) {
-		/* There should be no reason for this, a g_error() so that it gets
-		   picked up by Apport and we can track it */
-		g_error("No exec line given, nothing to do except fail");
-		return 1;
-	}
-
-	/* For the tracepoints */
-	const gchar * app_id = g_getenv("APP_ID");
-
-	ual_tracepoint(exec_start, app_id);
-
-	/* URIs */
-	const gchar * app_uris = g_getenv("APP_URIS");
-
-	/* Look to see if we have a directory defined that we
-	   should be using for everything.  If so, change to it
-	   and add it to the path */
-	const gchar * appdir = g_getenv("APP_DIR");
-
-	if (appdir != NULL) {
-		if (g_chdir(appdir) != 0) {
-			g_warning("Unable to change directory to '%s'", appdir);
-		}
-	}
-
-	/* Protect against app directories that have ':' in them */
-	if (appdir != NULL && strchr(appdir, ':') == NULL) {
-		const gchar * path_path = g_getenv("PATH");
-		if (path_path != NULL && path_path[0] == '\0')
-			path_path = NULL;
-		gchar * path_libpath = NULL;
-		const gchar * path_joinable[4] = { 0 };
-
-		const gchar * lib_path = g_getenv("LD_LIBRARY_PATH");
-		if (lib_path != NULL && lib_path[0] == '\0')
-			lib_path = NULL;
-		gchar * lib_libpath = g_build_filename(appdir, "lib", NULL);
-		const gchar * lib_joinable[4] = { 0 };
-
-		const gchar * import_path = g_getenv("QML2_IMPORT_PATH");
-		if (import_path != NULL && import_path[0] == '\0')
-			import_path = NULL;
-		gchar * import_libpath = NULL;
-		const gchar * import_joinable[4] = { 0 };
-
-		/* If we've got an architecture set insert that into the
-		   path before everything else */
-		const gchar * archdir = g_getenv("UBUNTU_APP_LAUNCH_ARCH");
-		if (archdir != NULL && strchr(archdir, ':') == NULL) {
-			path_libpath = g_build_filename(appdir, "lib", archdir, "bin", NULL);
-			import_libpath = g_build_filename(appdir, "lib", archdir, NULL);
-
-			path_joinable[0] = path_libpath;
-			path_joinable[1] = appdir;
-			path_joinable[2] = path_path;
-
-			lib_joinable[0] = import_libpath;
-			lib_joinable[1] = lib_libpath;
-			lib_joinable[2] = lib_path;
-
-			/* Need to check whether the original is NULL because we're
-			   appending instead of prepending */
-			if (import_path == NULL) {
-				import_joinable[0] = import_libpath;
-			} else {
-				import_joinable[0] = import_path;
-				import_joinable[1] = import_libpath;
-			}
-		} else {
-			path_joinable[0] = appdir;
-			path_joinable[1] = path_path;
-
-			lib_joinable[0] = lib_libpath;
-			lib_joinable[1] = lib_path;
-
-			import_joinable[0] = import_path;
-		}
-
-		gchar * newpath = g_strjoinv(":", (gchar**)path_joinable);
-		g_setenv("PATH", newpath, TRUE);
-		g_free(path_libpath);
-		g_free(newpath);
-
-		gchar * newlib = g_strjoinv(":", (gchar**)lib_joinable);
-		g_setenv("LD_LIBRARY_PATH", newlib, TRUE);
-		g_free(lib_libpath);
-		g_free(newlib);
-
-		if (import_joinable[0] != NULL) {
-			gchar * newimport = g_strjoinv(":", (gchar**)import_joinable);
-			g_setenv("QML2_IMPORT_PATH", newimport, TRUE);
-			g_free(newimport);
-		}
-		g_free(import_libpath);
-	}
-
-	/* Parse the execiness of it all */
-	GArray * newargv = desktop_exec_parse(app_exec, app_uris);
-	if (newargv == NULL) {
-		g_warning("Unable to parse exec line '%s'", app_exec);
-		return 1;
-	}
-
-	ual_tracepoint(exec_parse_complete, app_id);
-
-	if (g_getenv("MIR_SOCKET") != NULL && g_strcmp0(g_getenv("APP_XMIR_ENABLE"), "1") == 0) {
-		g_debug("XMir Helper being used");
-
-		/* xmir-helper $(APP_ID) $(COMMAND) */
-		const gchar * appid = g_getenv("APP_ID");
-		g_array_prepend_val(newargv, appid);
-
-		/* Pulling into the heap instead of the code page */
-		char * xmir_helper = g_strdup(XMIR_HELPER);
-		g_array_prepend_val(newargv, xmir_helper);
-	}
-
-	/* Now exec */
-	gchar ** nargv = (gchar**)g_array_free(newargv, FALSE);
-
-	ual_tracepoint(exec_pre_exec, app_id);
-
-	int execret = execvp(nargv[0], nargv);
-
-	if (execret != 0) {
-		gchar * execprint = g_strjoinv(" ", nargv);
-		g_warning("Unable to exec '%s' in '%s': %s", execprint, appdir, strerror(errno));
-		g_free(execprint);
-	}
-
-	return execret;
-}

=== modified file 'libubuntu-app-launch/CMakeLists.txt'
--- libubuntu-app-launch/CMakeLists.txt	2016-11-17 16:58:26 +0000
+++ libubuntu-app-launch/CMakeLists.txt	2017-02-22 21:41:30 +0000
@@ -36,6 +36,7 @@
 set(LAUNCHER_CPP_SOURCES
 application.cpp
 helper.cpp
+helper-impl.h
 registry.cpp
 registry-impl.h
 registry-impl.cpp
@@ -51,15 +52,12 @@
 application-info-desktop.cpp
 application-icon-finder.h
 application-icon-finder.cpp
-helper-impl-click.cpp
 glib-thread.h
 glib-thread.cpp
 jobs-base.h
 jobs-base.cpp
 jobs-systemd.h
 jobs-systemd.cpp
-jobs-upstart.h
-jobs-upstart.cpp
 )
 
 set(LAUNCHER_SOURCES

=== removed file 'libubuntu-app-launch/helper-impl-click.h'
--- libubuntu-app-launch/helper-impl-click.h	2016-06-09 14:55:34 +0000
+++ libubuntu-app-launch/helper-impl-click.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright © 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include <list>
-
-#include "helper.h"
-
-namespace ubuntu
-{
-namespace app_launch
-{
-namespace helper_impls
-{
-
-class Click : public Helper
-{
-public:
-    Click(const Helper::Type& type, const AppID& appid, const std::shared_ptr<Registry>& registry)
-        : _type(type)
-        , _appid(appid)
-        , _registry(registry)
-    {
-    }
-
-    AppID appId() override
-    {
-        return _appid;
-    }
-
-    bool hasInstances() override;
-    std::vector<std::shared_ptr<Helper::Instance>> instances() override;
-
-    std::shared_ptr<Helper::Instance> launch(std::vector<Helper::URL> urls = {}) override;
-    std::shared_ptr<Helper::Instance> launch(MirPromptSession* session, std::vector<Helper::URL> urls = {}) override;
-
-    static std::list<std::shared_ptr<Helper>> running(Helper::Type type, std::shared_ptr<Registry> registry);
-
-private:
-    Helper::Type _type;
-    AppID _appid;
-    std::shared_ptr<Registry> _registry;
-};
-
-}  // namespace helper_impl
-}  // namespace app_launch
-}  // namespace ubuntu

=== added file 'libubuntu-app-launch/helper-impl.h'
--- libubuntu-app-launch/helper-impl.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/helper-impl.h	2017-02-22 21:41:30 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2017 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#pragma once
+
+#include <list>
+
+#include "helper.h"
+#include "jobs-base.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace helper_impls
+{
+
+/** We really should have put a relationship between Helper::Instance
+and Application::Instance in the API. But to work around that today
+we're just handling it here because the helper interface is a subset
+of what the Application::Instance class provides */
+class BaseInstance : public Helper::Instance
+{
+public:
+    std::shared_ptr<jobs::instance::Base> impl;
+
+    BaseInstance(const std::shared_ptr<jobs::instance::Base>& inst);
+    BaseInstance(const std::shared_ptr<Application::Instance>& inst);
+
+    bool isRunning() override;
+    void stop() override;
+
+    const std::string& getInstanceId()
+    {
+        return impl->getInstanceId();
+    }
+};
+
+class Base : public Helper
+{
+public:
+    Base(const Helper::Type& type, const AppID& appid, const std::shared_ptr<Registry>& registry);
+
+    AppID appId() override;
+
+    bool hasInstances() override;
+    std::vector<std::shared_ptr<Helper::Instance>> instances() override;
+
+    std::shared_ptr<Helper::Instance> launch(std::vector<Helper::URL> urls = {}) override;
+    std::shared_ptr<Helper::Instance> launch(MirPromptSession* session, std::vector<Helper::URL> urls = {}) override;
+
+    std::shared_ptr<Helper::Instance> existingInstance(const std::string& instanceid);
+
+private:
+    Helper::Type _type;
+    AppID _appid;
+    std::shared_ptr<Registry> _registry;
+};
+
+}  // namespace helper_impl
+}  // namespace app_launch
+}  // namespace ubuntu

=== renamed file 'libubuntu-app-launch/helper-impl-click.cpp' => 'libubuntu-app-launch/helper.cpp'
--- libubuntu-app-launch/helper-impl-click.cpp	2016-06-09 14:55:34 +0000
+++ libubuntu-app-launch/helper.cpp	2017-02-22 21:41:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Canonical Ltd.
+ * Copyright © 2016-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -17,11 +17,19 @@
  *     Ted Gould <[e-mail]>
  */
 
-#include "helper-impl-click.h"
+#include <algorithm>
+#include <list>
+
+#include "helper-impl.h"
 #include "registry-impl.h"
 
 #include "ubuntu-app-launch.h"
 
+extern "C" {
+#include "proxy-socket-demangler.h"
+#include <gio/gunixfdlist.h>
+}
+
 namespace ubuntu
 {
 namespace app_launch
@@ -29,148 +37,296 @@
 namespace helper_impls
 {
 
-bool Click::hasInstances()
-{
-    return _registry->impl->thread.executeOnThread<bool>([this]() {
-        auto instances = ubuntu_app_launch_list_helper_instances(_type.value().c_str(), ((std::string)_appid).c_str());
-        auto retval = (g_strv_length(instances) != 0);
-
-        g_strfreev(instances);
-
-        return retval;
-    });
-}
-
-class ClickInstance : public Helper::Instance
-{
-public: /* all one file, no one to hide from */
-    AppID _appid;
-    Helper::Type _type;
-    std::string _instanceid;
-    std::shared_ptr<Registry> _registry;
-
-    ClickInstance(const AppID& appid,
-                  const Helper::Type& type,
-                  const std::string& instanceid,
-                  std::shared_ptr<Registry> registry)
-        : _appid(appid)
-        , _type(type)
-        , _instanceid(instanceid)
-        , _registry(registry)
-    {
-    }
-
-    bool isRunning() override
-    {
-        return _registry->impl->thread.executeOnThread<bool>([this]() {
-            bool found = false;
-
-            auto instances =
-                ubuntu_app_launch_list_helper_instances(_type.value().c_str(), ((std::string)_appid).c_str());
-            for (int i = 0; instances[i] != nullptr; i++)
-            {
-                if (_instanceid == std::string(instances[i]))
+/**********************
+ * Instance
+ **********************/
+
+BaseInstance::BaseInstance(const std::shared_ptr<jobs::instance::Base>& inst)
+    : impl{inst}
+{
+}
+
+BaseInstance::BaseInstance(const std::shared_ptr<Application::Instance>& inst)
+    : impl{std::dynamic_pointer_cast<jobs::instance::Base>(inst)}
+{
+}
+
+bool BaseInstance::isRunning()
+{
+    return impl->isRunning();
+}
+
+void BaseInstance::stop()
+{
+    impl->stop();
+}
+
+/**********************
+ * Helper Class
+ **********************/
+
+Base::Base(const Helper::Type& type, const AppID& appid, const std::shared_ptr<Registry>& registry)
+    : _type(type)
+    , _appid(appid)
+    , _registry(registry)
+{
+}
+
+AppID Base::appId()
+{
+    return _appid;
+}
+
+bool Base::hasInstances()
+{
+    return instances().size() > 0;
+}
+
+std::vector<std::shared_ptr<Helper::Instance>> Base::instances()
+{
+    auto insts = _registry->impl->jobs->instances(_appid, _type.value());
+    std::vector<std::shared_ptr<Helper::Instance>> wrapped;
+
+    std::transform(insts.begin(), insts.end(), wrapped.begin(),
+                   [](std::shared_ptr<jobs::instance::Base>& inst) { return std::make_shared<BaseInstance>(inst); });
+
+    return wrapped;
+}
+
+/** Find an instance that we already know the ID of */
+std::shared_ptr<Helper::Instance> Base::existingInstance(const std::string& instanceid)
+{
+    auto appinst = _registry->impl->jobs->existing(_appid, _type.value(), instanceid, {});
+
+    return std::make_shared<BaseInstance>(appinst);
+}
+
+std::string genInstanceId()
+{
+    return std::to_string(g_get_real_time());
+}
+
+std::vector<Application::URL> appURL(const std::vector<Helper::URL>& in)
+{
+    std::vector<Application::URL> out;
+    std::transform(in.begin(), in.end(), out.begin(),
+                   [](Helper::URL url) { return Application::URL::from_raw(url.value()); });
+    return out;
+}
+
+std::shared_ptr<Helper::Instance> Base::launch(std::vector<Helper::URL> urls)
+{
+    std::function<std::list<std::pair<std::string, std::string>>()> envfunc = [this]() {
+        return std::list<std::pair<std::string, std::string>>{};
+    };
+
+    return std::make_shared<BaseInstance>(_registry->impl->jobs->launch(
+        _appid, _type.value(), genInstanceId(), appURL(urls), jobs::manager::launchMode::STANDARD, envfunc));
+}
+
+class MirFDProxy
+{
+public:
+    int mirfd;
+    std::shared_ptr<proxySocketDemangler> skel;
+    guint handle;
+    std::string path;
+    std::string name;
+
+    MirFDProxy(MirPromptSession* session, const AppID& appid, const std::shared_ptr<Registry>& reg)
+        : name(g_dbus_connection_get_unique_name(reg->impl->_dbus.get()))
+    {
+        /* Get the Mir FD */
+        std::promise<int> promise;
+        mir_prompt_session_new_fds_for_prompt_providers(
+            session, 1,
+            [](MirPromptSession* session, size_t count, int const* fdin, void* user_data) {
+                auto promise = static_cast<std::promise<int>*>(user_data);
+
+                if (count != 1)
                 {
-                    found = true;
-                    break;
+                    g_warning("Mir trusted session returned %d FDs instead of one", (int)count);
+                    promise->set_value(0);
+                    return;
                 }
-            }
-
-            g_strfreev(instances);
-
-            return found;
-        });
-    }
-
-    void stop() override
-    {
-        _registry->impl->thread.executeOnThread<bool>([this]() {
-            return ubuntu_app_launch_stop_multiple_helper(_type.value().c_str(), ((std::string)_appid).c_str(),
-                                                          _instanceid.c_str()) == TRUE;
-        });
+
+                promise->set_value(fdin[0]);
+            },
+            &promise);
+
+        mirfd = promise.get_future().get();
+
+        if (mirfd == 0)
+        {
+            throw std::runtime_error{"Unable to Mir FD from Prompt Session"};
+        }
+
+        /* Setup the DBus interface */
+        std::tie(skel, handle, path) =
+            reg->impl->thread.executeOnThread<std::tuple<std::shared_ptr<proxySocketDemangler>, guint, std::string>>(
+                [this, appid, reg]() {
+                    auto skel = std::shared_ptr<proxySocketDemangler>(
+                        proxy_socket_demangler_skeleton_new(),
+                        [](proxySocketDemangler* skel) { g_clear_object(&skel); });
+                    auto handle = g_signal_connect(G_OBJECT(skel.get()), "handle-get-mir-socket",
+                                                   G_CALLBACK(staticProxyCb), this);
+
+                    /* Find a path to export on */
+                    auto dbusAppid = dbusSafe(std::string{appid});
+                    std::string path;
+
+                    while (path.empty())
+                    {
+                        GError* error = nullptr;
+                        std::string tryname =
+                            "/com/canonical/UbuntuAppLaunch/" + dbusAppid + "/" + std::to_string(rand());
+
+                        g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(skel.get()), reg->impl->_dbus.get(),
+                                                         tryname.c_str(), &error);
+
+                        if (error == nullptr)
+                        {
+                            path = tryname;
+                        }
+                        else
+                        {
+                            if (!g_error_matches(error, G_DBUS_ERROR, G_DBUS_ERROR_OBJECT_PATH_IN_USE))
+                            {
+                                std::string message =
+                                    "Unable to export Mir trusted proxy: " + std::string{error->message};
+                                g_clear_error(&error);
+                                throw std::runtime_error{message};
+                            }
+                            g_clear_error(&error);
+                        }
+                    }
+
+                    return std::make_tuple(skel, handle, path);
+                });
+    }
+
+    ~MirFDProxy()
+    {
+        if (mirfd != 0)
+        {
+            close(mirfd);
+        }
+
+        if (handle != 0)
+        {
+            g_signal_handler_disconnect(skel.get(), handle);
+        }
+
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(skel.get()));
+    }
+
+    static std::string dbusSafe(const std::string& in)
+    {
+        std::string out = in;
+        std::transform(out.begin(), out.end(), out.begin(), [](char in) { return std::isalpha(in) ? in : '_'; });
+        return out;
+    }
+
+    bool proxyCb(GDBusMethodInvocation* invocation)
+    {
+        if (mirfd == 0)
+        {
+            g_warning("Mir FD proxy called with no FDs!");
+            return false;
+        }
+
+        /* Index into fds */
+        auto handle = g_variant_new_handle(0);
+        auto tuple = g_variant_new_tuple(&handle, 1);
+
+        GError* error = nullptr;
+        GUnixFDList* list = g_unix_fd_list_new();
+        g_unix_fd_list_append(list, mirfd, &error);
+
+        if (error == nullptr)
+        {
+            g_dbus_method_invocation_return_value_with_unix_fd_list(invocation, tuple, list);
+        }
+        else
+        {
+            g_variant_ref_sink(tuple);
+            g_variant_unref(tuple);
+        }
+
+        g_object_unref(list);
+
+        if (error != nullptr)
+        {
+            g_warning("Unable to pass FD %d: %s", mirfd, error->message);
+            g_error_free(error);
+            return false;
+        }
+
+        mirfd = 0;
+        return true;
+    }
+
+    static gboolean staticProxyCb(GObject* obj, GDBusMethodInvocation* invocation, gpointer user_data)
+    {
+        return static_cast<MirFDProxy*>(user_data)->proxyCb(invocation) ? TRUE : FALSE;
+    }
+
+    std::string getPath()
+    {
+        return path;
+    }
+
+    std::string getName()
+    {
+        return name;
     }
 };
 
-std::vector<std::shared_ptr<Click::Instance>> Click::instances()
-{
-    return _registry->impl->thread.executeOnThread<std::vector<std::shared_ptr<Click::Instance>>>(
-        [this]() -> std::vector<std::shared_ptr<Click::Instance>> {
-            std::vector<std::shared_ptr<Click::Instance>> vect;
-            auto instances =
-                ubuntu_app_launch_list_helper_instances(_type.value().c_str(), ((std::string)_appid).c_str());
-            for (int i = 0; instances[i] != nullptr; i++)
-            {
-                auto inst = std::make_shared<ClickInstance>(_appid, _type, instances[i], _registry);
-                vect.push_back(inst);
-            }
-
-            g_strfreev(instances);
-
-            return vect;
-        });
-}
-
-std::shared_ptr<gchar*> urlsToStrv(std::vector<Helper::URL> urls)
-{
-    if (urls.size() == 0)
-    {
+std::shared_ptr<Helper::Instance> Base::launch(MirPromptSession* session, std::vector<Helper::URL> urls)
+{
+    std::shared_ptr<MirFDProxy> proxy;
+    try
+    {
+        proxy = std::make_shared<MirFDProxy>(session, _appid, _registry);
+    }
+    catch (std::runtime_error& e)
+    {
+        g_warning("Error launching helper: %s", e.what());
         return {};
     }
 
-    auto array = g_array_new(TRUE, FALSE, sizeof(gchar*));
-
-    for (auto url : urls)
-    {
-        auto str = g_strdup(url.value().c_str());
-        g_array_append_val(array, str);
-    }
-
-    return std::shared_ptr<gchar*>((gchar**)g_array_free(array, FALSE), g_strfreev);
-}
-
-std::shared_ptr<Click::Instance> Click::launch(std::vector<Helper::URL> urls)
-{
-    auto urlstrv = urlsToStrv(urls);
-
-    return _registry->impl->thread.executeOnThread<std::shared_ptr<Click::Instance>>([this, urlstrv]() {
-        auto instanceid = ubuntu_app_launch_start_multiple_helper(_type.value().c_str(), ((std::string)_appid).c_str(),
-                                                                  urlstrv.get());
-        auto ret = std::make_shared<ClickInstance>(_appid, _type, instanceid, _registry);
-        g_free(instanceid);
-        return ret;
-    });
-}
-
-std::shared_ptr<Click::Instance> Click::launch(MirPromptSession* session, std::vector<Helper::URL> urls)
-{
-    auto urlstrv = urlsToStrv(urls);
-
-    return _registry->impl->thread.executeOnThread<std::shared_ptr<Click::Instance>>([this, session, urlstrv]() {
-        auto instanceid = ubuntu_app_launch_start_session_helper(_type.value().c_str(), session,
-                                                                 ((std::string)_appid).c_str(), urlstrv.get());
-
-        return std::make_shared<ClickInstance>(_appid, _type, instanceid, _registry);
-    });
-}
-
-std::list<std::shared_ptr<Helper>> Click::running(Helper::Type type, std::shared_ptr<Registry> registry)
-{
-    return registry->impl->thread.executeOnThread<std::list<std::shared_ptr<Helper>>>([type, registry]() {
-        std::list<std::shared_ptr<Helper>> helpers;
-
-        auto appidv = ubuntu_app_launch_list_helpers(type.value().c_str());
-        for (int i = 0; appidv[i] != nullptr; i++)
-        {
-            auto helper = std::make_shared<Click>(type, AppID::parse(appidv[i]), registry);
-            helpers.push_back(helper);
-        }
-
-        g_strfreev(appidv);
-
-        return helpers;
-    });
+    std::function<std::list<std::pair<std::string, std::string>>()> envfunc = [proxy]() {
+        std::list<std::pair<std::string, std::string>> envs;
+
+        envs.emplace_back(std::make_pair("UBUNTU_APP_LAUNCH_DEMANGLE_PATH", proxy->getPath()));
+        envs.emplace_back(std::make_pair("UBUNTU_APP_LAUNCH_DEMANGLE_NAME", proxy->getName()));
+
+        return envs;
+    };
+
+    /* This will maintain a reference to the proxy for two
+       seconds. And then it'll be dropped. */
+    _registry->impl->thread.timeout(std::chrono::seconds{2}, [proxy]() { g_debug("Mir Proxy Timeout"); });
+
+    return std::make_shared<BaseInstance>(_registry->impl->jobs->launch(
+        _appid, _type.value(), genInstanceId(), appURL(urls), jobs::manager::launchMode::STANDARD, envfunc));
 }
 
 }  // namespace helper_impl
+
+/***************************/
+/* Helper Public Functions */
+/***************************/
+
+std::shared_ptr<Helper> Helper::create(Type type, AppID appid, std::shared_ptr<Registry> registry)
+{
+    /* Only one type today */
+    return std::make_shared<helper_impls::Base>(type, appid, registry);
+}
+
+void Helper::setExec(std::vector<std::string> exec)
+{
+}
+
 }  // namespace app_launch
 }  // namespace ubuntu

=== removed file 'libubuntu-app-launch/helper.cpp'
--- libubuntu-app-launch/helper.cpp	2016-06-09 14:55:34 +0000
+++ libubuntu-app-launch/helper.cpp	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include "helper.h"
-
-#include "helper-impl-click.h"
-
-namespace ubuntu
-{
-namespace app_launch
-{
-
-std::shared_ptr<Helper> Helper::create(Type type, AppID appid, std::shared_ptr<Registry> registry)
-{
-    /* Only one type today */
-    return std::make_shared<helper_impls::Click>(type, appid, registry);
-}
-
-}  // namespace AppLaunch
-}  // namespace Ubuntu

=== modified file 'libubuntu-app-launch/helper.h'
--- libubuntu-app-launch/helper.h	2017-01-26 22:46:49 +0000
+++ libubuntu-app-launch/helper.h	2017-02-22 21:41:30 +0000
@@ -126,6 +126,12 @@
         \param urls List of URLs to passed to the untrusted helper
     */
     virtual std::shared_ptr<Instance> launch(MirPromptSession* session, std::vector<URL> urls = {}) = 0;
+    /** Set the exec from a helper utility. This function should only
+        be used inside a helper exec util.
+
+        \param exec The exec line to use for the helper with the AppID given
+    */
+    static void setExec(std::vector<std::string> exec);
 };
 
 }  // namespace app_launch

=== modified file 'libubuntu-app-launch/jobs-base.cpp'
--- libubuntu-app-launch/jobs-base.cpp	2017-01-26 22:46:06 +0000
+++ libubuntu-app-launch/jobs-base.cpp	2017-02-22 21:41:30 +0000
@@ -23,9 +23,9 @@
 #include <numeric>
 
 #include "application-impl-base.h"
+#include "helper-impl.h"
 #include "jobs-base.h"
 #include "jobs-systemd.h"
-#include "jobs-upstart.h"
 #include "registry-impl.h"
 
 namespace ubuntu
@@ -61,29 +61,87 @@
     dohandle(handle_appResumed);
 }
 
+/** Should determine which jobs backend to use, but we only have
+    one right now. */
 std::shared_ptr<Base> Base::determineFactory(std::shared_ptr<Registry> registry)
 {
-    /* Checking to see if we have a user bus, that is only started
-       by systemd so we're in good shape if we have one. We're using
-       the path instead of the RUNTIME variable because we want to work
-       around the case of being relocated by the snappy environment */
-    if (g_file_test(SystemD::userBusPath().c_str(), G_FILE_TEST_EXISTS))
-    {
-        g_debug("Building a systemd jobs manager");
-        return std::make_shared<jobs::manager::SystemD>(registry);
-    }
-    else
-    {
-        g_debug("Building an Upstart jobs manager");
-        return std::make_shared<jobs::manager::Upstart>(registry);
-    }
+    g_debug("Building a systemd jobs manager");
+    return std::make_shared<jobs::manager::SystemD>(registry);
 }
 
-const std::set<std::string>& Base::getAllJobs() const
+const std::list<std::string>& Base::getAllJobs() const
 {
     return allJobs_;
 }
 
+core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& Base::appStarted()
+{
+    std::call_once(flag_appStarted, [this]() {
+        jobStarted().connect([this](const std::string& job, const std::string& appid, const std::string& instanceid) {
+            if (std::find(allJobs_.begin(), allJobs_.end(), job) == allJobs_.end())
+            {
+                return;
+            }
+
+            auto reg = registry_.lock();
+
+            auto appId = AppID::find(reg, appid);
+            auto app = Application::create(appId, reg);
+            auto inst = std::dynamic_pointer_cast<app_impls::Base>(app)->findInstance(instanceid);
+
+            sig_appStarted(app, inst);
+        });
+    });
+
+    return sig_appStarted;
+}
+
+core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& Base::appStopped()
+{
+    std::call_once(flag_appStopped, [this]() {
+        jobStopped().connect([this](const std::string& job, const std::string& appid, const std::string& instanceid) {
+            if (std::find(allJobs_.begin(), allJobs_.end(), job) == allJobs_.end())
+            {
+                return;
+            }
+
+            auto reg = registry_.lock();
+
+            auto appId = AppID::find(reg, appid);
+            auto app = Application::create(appId, reg);
+            auto inst = std::dynamic_pointer_cast<app_impls::Base>(app)->findInstance(instanceid);
+
+            sig_appStopped(app, inst);
+        });
+    });
+
+    return sig_appStopped;
+}
+
+core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&, Registry::FailureType>&
+    Base::appFailed()
+{
+    std::call_once(flag_appFailed, [this]() {
+        jobFailed().connect([this](const std::string& job, const std::string& appid, const std::string& instanceid,
+                                   Registry::FailureType reason) {
+            if (std::find(allJobs_.begin(), allJobs_.end(), job) == allJobs_.end())
+            {
+                return;
+            }
+
+            auto reg = registry_.lock();
+
+            auto appId = AppID::find(reg, appid);
+            auto app = Application::create(appId, reg);
+            auto inst = std::dynamic_pointer_cast<app_impls::Base>(app)->findInstance(instanceid);
+
+            sig_appFailed(app, inst, reason);
+        });
+    });
+
+    return sig_appFailed;
+}
+
 /** Structure to track the data needed for upstart events. This cleans
     up the lifecycle as we're passing this as a pointer through the
     GLib calls. */
@@ -229,6 +287,127 @@
     return sig_appResumed;
 }
 
+core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& Base::helperStarted(
+    Helper::Type type)
+{
+    try
+    {
+        return *sig_helpersStarted.at(type.value());
+    }
+    catch (std::out_of_range& e)
+    {
+        jobStarted().connect(
+            [this, type](const std::string& job, const std::string& appid, const std::string& instanceid) {
+                if (job != type.value())
+                {
+                    return;
+                }
+
+                try
+                {
+                    auto reg = registry_.lock();
+
+                    auto appId = ubuntu::app_launch::AppID::parse(appid);
+                    auto helper = Helper::create(type, appId, reg);
+                    auto inst = std::dynamic_pointer_cast<helper_impls::Base>(helper)->existingInstance(instanceid);
+
+                    (*sig_helpersStarted.at(type.value()))(helper, inst);
+                }
+                catch (...)
+                {
+                    g_warning("Unable to emit signal for helper type: %s", type.value().c_str());
+                }
+            });
+
+        sig_helpersStarted.emplace(
+            type.value(),
+            std::make_shared<core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>>());
+    }
+
+    return *sig_helpersStarted.at(type.value());
+}
+
+core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& Base::helperStopped(
+    Helper::Type type)
+{
+    try
+    {
+        return *sig_helpersStopped.at(type.value());
+    }
+    catch (std::out_of_range& e)
+    {
+        jobStopped().connect(
+            [this, type](const std::string& job, const std::string& appid, const std::string& instanceid) {
+                if (job != type.value())
+                {
+                    return;
+                }
+
+                try
+                {
+                    auto reg = registry_.lock();
+
+                    auto appId = ubuntu::app_launch::AppID::parse(appid);
+                    auto helper = Helper::create(type, appId, reg);
+                    auto inst = std::dynamic_pointer_cast<helper_impls::Base>(helper)->existingInstance(instanceid);
+
+                    (*sig_helpersStopped.at(type.value()))(helper, inst);
+                }
+                catch (...)
+                {
+                    g_warning("Unable to emit signal for helper type: %s", type.value().c_str());
+                }
+            });
+
+        sig_helpersStopped.emplace(
+            type.value(),
+            std::make_shared<core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>>());
+    }
+
+    return *sig_helpersStopped.at(type.value());
+}
+
+core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&, Registry::FailureType>&
+    Base::helperFailed(Helper::Type type)
+{
+    try
+    {
+        return *sig_helpersFailed.at(type.value());
+    }
+    catch (std::out_of_range& e)
+    {
+        jobFailed().connect([this, type](const std::string& job, const std::string& appid,
+                                         const std::string& instanceid, Registry::FailureType reason) {
+            if (job != type.value())
+            {
+                return;
+            }
+
+            try
+            {
+                auto reg = registry_.lock();
+
+                auto appId = ubuntu::app_launch::AppID::parse(appid);
+                auto helper = Helper::create(type, appId, reg);
+                auto inst = std::dynamic_pointer_cast<helper_impls::Base>(helper)->existingInstance(instanceid);
+
+                (*sig_helpersFailed.at(type.value()))(helper, inst, reason);
+            }
+            catch (...)
+            {
+                g_warning("Unable to emit signal for helper type: %s", type.value().c_str());
+            }
+        });
+
+        sig_helpersFailed.emplace(
+            type.value(),
+            std::make_shared<core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&,
+                                          Registry::FailureType>>());
+    }
+
+    return *sig_helpersFailed.at(type.value());
+}
+
 /** Take the GVariant of parameters and turn them into an application and
     and instance. Easier to read in the smaller function */
 std::tuple<std::shared_ptr<Application>, std::shared_ptr<Application::Instance>> Base::managerParams(
@@ -426,6 +605,66 @@
     manager_.reset();
 }
 
+/** Get application objects for all of the applications based
+    on the appids associated with the application jobs */
+std::list<std::shared_ptr<Application>> Base::runningApps()
+{
+    auto registry = registry_.lock();
+
+    if (!registry)
+    {
+        g_warning("Unable to list apps without a registry");
+        return {};
+    }
+
+    auto appids = runningAppIds(allJobs_);
+
+    std::list<std::shared_ptr<Application>> apps;
+    for (const auto& appid : appids)
+    {
+        auto id = AppID::find(registry, appid);
+        if (id.empty())
+        {
+            g_debug("Unable to handle AppID: %s", appid.c_str());
+            continue;
+        }
+
+        apps.emplace_back(Application::create(id, registry));
+    }
+
+    return apps;
+}
+
+/** Get application objects for all of the applications based
+    on the appids associated with the application jobs */
+std::list<std::shared_ptr<Helper>> Base::runningHelpers(const Helper::Type& type)
+{
+    auto registry = registry_.lock();
+
+    if (!registry)
+    {
+        g_warning("Unable to list helpers without a registry");
+        return {};
+    }
+
+    auto appids = runningAppIds({type.value()});
+
+    std::list<std::shared_ptr<Helper>> helpers;
+    for (const auto& appid : appids)
+    {
+        auto id = AppID::parse(appid);
+        if (id.empty())
+        {
+            g_debug("Unable to handle AppID: %s", appid.c_str());
+            continue;
+        }
+
+        helpers.emplace_back(Helper::create(type, id, registry));
+    }
+
+    return helpers;
+}
+
 }  // namespace manager
 
 namespace instance

=== modified file 'libubuntu-app-launch/jobs-base.h'
--- libubuntu-app-launch/jobs-base.h	2017-01-26 22:46:06 +0000
+++ libubuntu-app-launch/jobs-base.h	2017-02-22 21:41:30 +0000
@@ -24,6 +24,7 @@
 
 #include <core/signal.h>
 #include <gio/gio.h>
+#include <map>
 #include <set>
 
 namespace ubuntu
@@ -50,6 +51,11 @@
     void pause() override;
     void resume() override;
 
+    const std::string& getInstanceId()
+    {
+        return instance_;
+    }
+
     /* OOM Functions */
     void setOomAdjustment(const oom::Score score) override;
     const oom::Score getOomAdjustment() override;
@@ -111,23 +117,26 @@
                                                             const std::string& instance,
                                                             const std::vector<Application::URL>& urls) = 0;
 
-    virtual std::list<std::shared_ptr<Application>> runningApps() = 0;
+    virtual std::list<std::shared_ptr<Application>> runningApps();
+    virtual std::list<std::shared_ptr<Helper>> runningHelpers(const Helper::Type& type);
+
+    virtual std::list<std::string> runningAppIds(const std::list<std::string>& jobs) = 0;
 
     virtual std::vector<std::shared_ptr<instance::Base>> instances(const AppID& appID, const std::string& job) = 0;
 
-    const std::set<std::string>& getAllJobs() const;
+    const std::list<std::string>& getAllJobs() const;
 
     static std::shared_ptr<Base> determineFactory(std::shared_ptr<Registry> registry);
 
     /* Signals to apps */
     virtual core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>&
-        appStarted() = 0;
+        appStarted();
     virtual core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>&
-        appStopped() = 0;
+        appStopped();
     virtual core::Signal<const std::shared_ptr<Application>&,
                          const std::shared_ptr<Application::Instance>&,
                          Registry::FailureType>&
-        appFailed() = 0;
+        appFailed();
     virtual core::Signal<const std::shared_ptr<Application>&,
                          const std::shared_ptr<Application::Instance>&,
                          const std::vector<pid_t>&>&
@@ -136,6 +145,19 @@
                          const std::shared_ptr<Application::Instance>&,
                          const std::vector<pid_t>&>&
         appResumed();
+    /* Signals to helpers */
+    virtual core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& helperStarted(
+        Helper::Type type);
+    virtual core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& helperStopped(
+        Helper::Type type);
+    virtual core::
+        Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&, Registry::FailureType>&
+        helperFailed(Helper::Type type);
+    /* Job signals from implementations */
+    virtual core::Signal<const std::string&, const std::string&, const std::string&>& jobStarted() = 0;
+    virtual core::Signal<const std::string&, const std::string&, const std::string&>& jobStopped() = 0;
+    virtual core::Signal<const std::string&, const std::string&, const std::string&, Registry::FailureType>&
+        jobFailed() = 0;
 
     /* App manager */
     virtual void setManager(std::shared_ptr<Registry::Manager> manager);
@@ -146,7 +168,7 @@
     std::weak_ptr<Registry> registry_;
 
     /** A set of all the job names */
-    std::set<std::string> allJobs_;
+    std::list<std::string> allJobs_;
 
     /** The DBus connection we're connecting to */
     std::shared_ptr<GDBusConnection> dbus_;
@@ -154,6 +176,7 @@
     /** Application manager instance */
     std::shared_ptr<Registry::Manager> manager_;
 
+private:
     /** Signal object for applications started */
     core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&> sig_appStarted;
     /** Signal object for applications stopped */
@@ -174,7 +197,18 @@
                  const std::vector<pid_t>&>
         sig_appResumed;
 
-private:
+    std::map<std::string,
+             std::shared_ptr<core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>>>
+        sig_helpersStarted;
+    std::map<std::string,
+             std::shared_ptr<core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>>>
+        sig_helpersStopped;
+    std::map<std::string,
+             std::shared_ptr<core::Signal<const std::shared_ptr<Helper>&,
+                                          const std::shared_ptr<Helper::Instance>&,
+                                          Registry::FailureType>>>
+        sig_helpersFailed;
+
     guint handle_managerSignalFocus{0};    /**< GDBus signal watcher handle for app focused signal */
     guint handle_managerSignalResume{0};   /**< GDBus signal watcher handle for app resumed signal */
     guint handle_managerSignalStarting{0}; /**< GDBus signal watcher handle for app starting signal */
@@ -183,6 +217,12 @@
 
     std::once_flag flag_managerSignals; /**< Variable to track to see if signal handlers are installed for the manager
                                            signals of focused, resumed and starting */
+    std::once_flag flag_appStarted;     /**< Variable to track to see if signal handlers are installed for application
+                                           started */
+    std::once_flag flag_appStopped;     /**< Variable to track to see if signal handlers are installed for application
+                                           stopped */
+    std::once_flag
+        flag_appFailed; /**< Variable to track to see if signal handlers are installed for application failed */
     std::once_flag
         flag_appPaused; /**< Variable to track to see if signal handlers are installed for application paused */
     std::once_flag flag_appResumed; /**< Variable to track to see if signal handlers are installed for application

=== modified file 'libubuntu-app-launch/jobs-systemd.cpp'
--- libubuntu-app-launch/jobs-systemd.cpp	2017-02-04 04:06:20 +0000
+++ libubuntu-app-launch/jobs-systemd.cpp	2017-02-22 21:41:30 +0000
@@ -239,7 +239,7 @@
                 try
                 {
                     auto info = pthis->unitNew(unitname, unitpath, pthis->userbus_);
-                    pthis->emitSignal(pthis->sig_appStarted, info);
+                    pthis->sig_jobStarted(info.job, info.appid, info.inst);
                 }
                 catch (std::runtime_error& e)
                 {
@@ -869,7 +869,7 @@
     return instances;
 }
 
-std::list<std::shared_ptr<Application>> SystemD::runningApps()
+std::list<std::string> SystemD::runningAppIds(const std::list<std::string>& allJobs)
 {
     auto registry = registry_.lock();
 
@@ -879,14 +879,13 @@
         return {};
     }
 
-    auto allJobs = getAllJobs();
     std::set<std::string> appids;
 
     for (const auto& unit : unitPaths)
     {
         const SystemD::UnitInfo& unitinfo = unit.first;
 
-        if (allJobs.find(unitinfo.job) == allJobs.end())
+        if (std::find(allJobs.begin(), allJobs.end(), unitinfo.job) == allJobs.end())
         {
             continue;
         }
@@ -894,20 +893,7 @@
         appids.insert(unitinfo.appid);
     }
 
-    std::list<std::shared_ptr<Application>> apps;
-    for (const auto& appid : appids)
-    {
-        auto id = AppID::find(registry, appid);
-        if (id.empty())
-        {
-            g_debug("Unable to handle AppID: %s", appid.c_str());
-            continue;
-        }
-
-        apps.emplace_back(Application::create(id, registry));
-    }
-
-    return apps;
+    return {appids.begin(), appids.end()};
 }
 
 std::string SystemD::userBusPath()
@@ -1038,26 +1024,8 @@
     if (it != unitPaths.end())
     {
         unitPaths.erase(it);
-        emitSignal(sig_appStopped, info);
-    }
-}
-
-void SystemD::emitSignal(
-    core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& sig,
-    UnitInfo& info)
-{
-    auto reg = registry_.lock();
-    if (!reg)
-    {
-        g_warning("Unable to emit systemd signal, invalid registry");
-        return;
-    }
-
-    auto appid = AppID::find(reg, info.appid);
-    auto app = Application::create(appid, reg);
-    auto inst = std::dynamic_pointer_cast<app_impls::Base>(app)->findInstance(info.inst);
-
-    sig(app, inst);
+        sig_jobStopped(info.job, info.appid, info.inst);
+    }
 }
 
 pid_t SystemD::unitPrimaryPid(const AppID& appId, const std::string& job, const std::string& instance)
@@ -1252,18 +1220,18 @@
     });
 }
 
-core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& SystemD::appStarted()
+core::Signal<const std::string&, const std::string&, const std::string&>& SystemD::jobStarted()
 {
     /* For systemd we're automatically listening to the UnitNew signal
        and emitting on the object */
-    return sig_appStarted;
+    return sig_jobStarted;
 }
 
-core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& SystemD::appStopped()
+core::Signal<const std::string&, const std::string&, const std::string&>& SystemD::jobStopped()
 {
     /* For systemd we're automatically listening to the UnitRemoved signal
        and emitting on the object */
-    return sig_appStopped;
+    return sig_jobStopped;
 }
 
 struct FailedData
@@ -1271,8 +1239,7 @@
     std::weak_ptr<Registry> registry;
 };
 
-core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&, Registry::FailureType>&
-    SystemD::appFailed()
+core::Signal<const std::string&, const std::string&, const std::string&, Registry::FailureType>& SystemD::jobFailed()
 {
     std::call_once(flag_appFailed, [this]() {
         auto reg = registry_.lock();
@@ -1352,11 +1319,7 @@
                         reason = Registry::FailureType::START_FAILURE;
                     }
 
-                    auto appid = AppID::find(reg, unitinfo.appid);
-                    auto app = Application::create(appid, reg);
-                    auto inst = std::dynamic_pointer_cast<app_impls::Base>(app)->findInstance(unitinfo.inst);
-
-                    manager->sig_appFailed(app, inst, reason);
+                    manager->sig_jobFailed(unitinfo.job, unitinfo.appid, unitinfo.inst, reason);
                 },    /* callback */
                 data, /* user data */
                 [](gpointer user_data) {
@@ -1368,7 +1331,7 @@
         });
     });
 
-    return sig_appFailed;
+    return sig_jobFailed;
 }
 
 /** Requests that systemd reset a unit that has been marked as

=== modified file 'libubuntu-app-launch/jobs-systemd.h'
--- libubuntu-app-launch/jobs-systemd.h	2017-02-02 22:51:42 +0000
+++ libubuntu-app-launch/jobs-systemd.h	2017-02-22 21:41:30 +0000
@@ -53,18 +53,14 @@
                                                             const std::string& instance,
                                                             const std::vector<Application::URL>& urls) override;
 
-    virtual std::list<std::shared_ptr<Application>> runningApps() override;
+    virtual std::list<std::string> runningAppIds(const std::list<std::string>& jobs) override;
 
     virtual std::vector<std::shared_ptr<instance::Base>> instances(const AppID& appID, const std::string& job) override;
 
-    virtual core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>&
-        appStarted() override;
-    virtual core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>&
-        appStopped() override;
-    virtual core::Signal<const std::shared_ptr<Application>&,
-                         const std::shared_ptr<Application::Instance>&,
-                         Registry::FailureType>&
-        appFailed() override;
+    virtual core::Signal<const std::string&, const std::string&, const std::string&>& jobStarted() override;
+    virtual core::Signal<const std::string&, const std::string&, const std::string&>& jobStopped() override;
+    virtual core::Signal<const std::string&, const std::string&, const std::string&, Registry::FailureType>& jobFailed()
+        override;
 
     static std::string userBusPath();
 
@@ -76,6 +72,10 @@
     std::string cgroup_root_;
     std::shared_ptr<GDBusConnection> userbus_;
 
+    core::Signal<const std::string&, const std::string&, const std::string&> sig_jobStarted;
+    core::Signal<const std::string&, const std::string&, const std::string&> sig_jobStopped;
+    core::Signal<const std::string&, const std::string&, const std::string&, Registry::FailureType> sig_jobFailed;
+
     guint handle_unitNew{0};     /**< GDBus signal watcher handle for the unit new signal */
     guint handle_unitRemoved{0}; /**< GDBus signal watcher handle for the unit removed signal */
     guint handle_appFailed{0};   /**< GDBus signal watcher handle for app failed signal */
@@ -116,9 +116,6 @@
 
     UnitInfo unitNew(const std::string& name, const std::string& path, const std::shared_ptr<GDBusConnection>& bus);
     void unitRemoved(const std::string& name, const std::string& path);
-    void emitSignal(
-        core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& sig,
-        UnitInfo& info);
 
     static std::string findEnv(const std::string& value, std::list<std::pair<std::string, std::string>>& env);
     static void removeEnv(const std::string& value, std::list<std::pair<std::string, std::string>>& env);

=== removed file 'libubuntu-app-launch/jobs-upstart.cpp'
--- libubuntu-app-launch/jobs-upstart.cpp	2017-01-11 23:48:12 +0000
+++ libubuntu-app-launch/jobs-upstart.cpp	1970-01-01 00:00:00 +0000
@@ -1,1211 +0,0 @@
-/*
- * Copyright © 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include <algorithm>
-#include <cerrno>
-#include <cstring>
-#include <map>
-#include <numeric>
-#include <regex>
-
-#include <cgmanager/cgmanager.h>
-#include <upstart.h>
-
-#include "application-impl-base.h"
-#include "helpers.h"
-#include "registry-impl.h"
-#include "second-exec-core.h"
-
-extern "C" {
-#include "ubuntu-app-launch-trace.h"
-}
-
-#include "jobs-upstart.h"
-
-namespace ubuntu
-{
-namespace app_launch
-{
-namespace jobs
-{
-namespace instance
-{
-
-/** An object that represents an instance of a job on Upstart. This
-    then implements everything needed by the instance interface. Most
-    applications tie into this today and use it as the backend for
-    their instances. */
-class Upstart : public Base
-{
-public:
-    explicit Upstart(const AppID& appId,
-                     const std::string& job,
-                     const std::string& instance,
-                     const std::vector<Application::URL>& urls,
-                     const std::shared_ptr<Registry>& registry);
-
-    /* Query lifecycle */
-    pid_t primaryPid() override;
-    std::string logPath() override;
-    std::vector<pid_t> pids() override;
-
-    /* Manage lifecycle */
-    void stop() override;
-    void pause() override;
-    void resume() override;
-
-    /* C Callback */
-    static void application_start_cb(GObject* obj, GAsyncResult* res, gpointer user_data);
-
-private:
-    std::string upstartJobPath();
-    std::string upstartName();
-
-    static std::vector<pid_t> pids(const std::shared_ptr<Registry>& reg,
-                                   const AppID& appid,
-                                   const std::string& jobpath);
-    static std::vector<pid_t> forAllPids(const std::shared_ptr<Registry>& reg,
-                                         const AppID& appid,
-                                         const std::string& jobpath,
-                                         std::function<void(pid_t)> eachPid);
-};
-
-/** Uses Upstart to get the primary PID of the instance using Upstart's
-    DBus interface */
-pid_t Upstart::primaryPid()
-{
-    auto jobpath = upstartJobPath();
-    if (jobpath.empty())
-    {
-        g_debug("Unable to get a valid job path");
-        return 0;
-    }
-
-    return registry_->impl->thread.executeOnThread<pid_t>([this, &jobpath]() -> pid_t {
-        GError* error = nullptr;
-
-        std::string instancename = std::string(appId_);
-        if (job_ != "application-click")
-        {
-            instancename += "-" + instance_;
-        }
-
-        g_debug("Getting instance by name: %s", instance_.c_str());
-        auto vinstance_path =
-            g_dbus_connection_call_sync(registry_->impl->_dbus.get(),                   /* connection */
-                                        DBUS_SERVICE_UPSTART,                           /* service */
-                                        jobpath.c_str(),                                /* object path */
-                                        DBUS_INTERFACE_UPSTART_JOB,                     /* iface */
-                                        "GetInstanceByName",                            /* method */
-                                        g_variant_new("(s)", instancename.c_str()),     /* params */
-                                        G_VARIANT_TYPE("(o)"),                          /* return type */
-                                        G_DBUS_CALL_FLAGS_NONE,                         /* flags */
-                                        -1,                                             /* timeout: default */
-                                        registry_->impl->thread.getCancellable().get(), /* cancellable */
-                                        &error);
-
-        if (error != nullptr)
-        {
-            g_warning("Unable to get instance '%s' of job '%s': %s", instance_.c_str(), job_.c_str(), error->message);
-            g_error_free(error);
-            return 0;
-        }
-
-        /* Jump rope to make this into a C++ type */
-        std::string instance_path;
-        gchar* cinstance_path = nullptr;
-        g_variant_get(vinstance_path, "(o)", &cinstance_path);
-        g_variant_unref(vinstance_path);
-        if (cinstance_path != nullptr)
-        {
-            instance_path = cinstance_path;
-            g_free(cinstance_path);
-        }
-
-        if (instance_path.empty())
-        {
-            g_debug("No instance object for instance name: %s", instance_.c_str());
-            return 0;
-        }
-
-        auto props_tuple =
-            g_dbus_connection_call_sync(registry_->impl->_dbus.get(),                          /* connection */
-                                        DBUS_SERVICE_UPSTART,                                  /* service */
-                                        instance_path.c_str(),                                 /* object path */
-                                        "org.freedesktop.DBus.Properties",                     /* interface */
-                                        "GetAll",                                              /* method */
-                                        g_variant_new("(s)", DBUS_INTERFACE_UPSTART_INSTANCE), /* params */
-                                        G_VARIANT_TYPE("(a{sv})"),                             /* return type */
-                                        G_DBUS_CALL_FLAGS_NONE,                                /* flags */
-                                        -1,                                                    /* timeout: default */
-                                        registry_->impl->thread.getCancellable().get(),        /* cancellable */
-                                        &error);
-
-        if (error != nullptr)
-        {
-            g_warning("Unable to name of properties '%s': %s", instance_path.c_str(), error->message);
-            g_error_free(error);
-            error = nullptr;
-            return 0;
-        }
-
-        auto props_dict = g_variant_get_child_value(props_tuple, 0);
-
-        pid_t retval = 0;
-        auto processes = g_variant_lookup_value(props_dict, "processes", G_VARIANT_TYPE("a(si)"));
-        if (processes != nullptr && g_variant_n_children(processes) > 0)
-        {
-
-            auto first_entry = g_variant_get_child_value(processes, 0);
-            auto pidv = g_variant_get_child_value(first_entry, 1);
-
-            retval = g_variant_get_int32(pidv);
-
-            g_variant_unref(pidv);
-            g_variant_unref(first_entry);
-        }
-        else
-        {
-            g_debug("Unable to get 'processes' from properties of instance at path: %s", instance_path.c_str());
-        }
-
-        g_variant_unref(props_dict);
-
-        return retval;
-    });
-}
-
-/** Generate the full name of the Upstart job for the job, the
-    instance and how all those fit together.
-
-    Handles the special case of application-click which isn't designed
-    to have multi-instance apps.
-*/
-std::string Upstart::upstartName()
-{
-    std::string path = job_ + "-" + std::string(appId_);
-    if (job_ != "application-click")
-    {
-        path += "-";
-    }
-    if (!instance_.empty())
-    {
-        path += instance_;
-    }
-
-    return path;
-}
-
-/** Gets the path to the log file for this instance */
-std::string Upstart::logPath()
-{
-    std::string logfile = upstartName() + ".log";
-
-    gchar* cpath = g_build_filename(g_get_user_cache_dir(), "upstart", logfile.c_str(), nullptr);
-    std::string path(cpath);
-    g_free(cpath);
-
-    return path;
-}
-
-/** Returns all the PIDs that are in the cgroup for this application */
-std::vector<pid_t> Upstart::pids()
-{
-    auto manager = std::dynamic_pointer_cast<manager::Upstart>(registry_->impl->jobs);
-    auto pids = manager->pidsFromCgroup(upstartName());
-    g_debug("Got %d PIDs for AppID '%s'", int(pids.size()), std::string(appId_).c_str());
-    return pids;
-}
-
-/** Stops this instance by asking Upstart to stop it. Upstart will then
-    send a SIGTERM and five seconds later start killing things. */
-void Upstart::stop()
-{
-    if (!registry_->impl->thread.executeOnThread<bool>([this]() {
-            auto manager = std::dynamic_pointer_cast<manager::Upstart>(registry_->impl->jobs);
-
-            g_debug("Stopping job %s app_id %s instance_id %s", job_.c_str(), std::string(appId_).c_str(),
-                    instance_.c_str());
-
-            auto jobpath = upstartJobPath();
-            if (jobpath.empty())
-            {
-                throw new std::runtime_error("Unable to get job path for Upstart job '" + job_ + "'");
-            }
-
-            GVariantBuilder builder;
-            g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
-            g_variant_builder_open(&builder, G_VARIANT_TYPE_ARRAY);
-
-            g_variant_builder_add_value(
-                &builder, g_variant_new_take_string(g_strdup_printf("APP_ID=%s", std::string(appId_).c_str())));
-
-            if (!instance_.empty())
-            {
-                g_variant_builder_add_value(
-                    &builder, g_variant_new_take_string(g_strdup_printf("INSTANCE_ID=%s", instance_.c_str())));
-            }
-
-            g_variant_builder_close(&builder);
-            g_variant_builder_add_value(&builder, g_variant_new_boolean(FALSE)); /* wait */
-
-            GError* error = nullptr;
-            auto stop_variant =
-                g_dbus_connection_call_sync(registry_->impl->_dbus.get(),                   /* Dbus */
-                                            DBUS_SERVICE_UPSTART,                           /* Upstart name */
-                                            jobpath.c_str(),                                /* path */
-                                            DBUS_INTERFACE_UPSTART_JOB,                     /* interface */
-                                            "Stop",                                         /* method */
-                                            g_variant_builder_end(&builder),                /* params */
-                                            nullptr,                                        /* return */
-                                            G_DBUS_CALL_FLAGS_NONE,                         /* flags */
-                                            -1,                                             /* timeout: default */
-                                            registry_->impl->thread.getCancellable().get(), /* cancellable */
-                                            &error);                                        /* error (hopefully not) */
-
-            g_clear_pointer(&stop_variant, g_variant_unref);
-
-            if (error != nullptr)
-            {
-                g_warning("Unable to stop job %s app_id %s instance_id %s: %s", job_.c_str(),
-                          std::string(appId_).c_str(), instance_.c_str(), error->message);
-                g_error_free(error);
-                return false;
-            }
-
-            return true;
-        }))
-    {
-        g_warning("Unable to stop Upstart instance");
-    }
-}
-
-/** Create a new Upstart Instance object that can track the job and
-    get information about it.
-
-    \param appId Application ID
-    \param job Upstart job name
-    \param instance Upstart instance name
-    \param urls URLs sent to the application (only on launch today)
-    \param registry Registry of persistent connections to use
-*/
-Upstart::Upstart(const AppID& appId,
-                 const std::string& job,
-                 const std::string& instance,
-                 const std::vector<Application::URL>& urls,
-                 const std::shared_ptr<Registry>& registry)
-    : Base(appId, job, instance, urls, registry)
-{
-    g_debug("Creating a new Upstart for '%s' instance '%s'", std::string(appId).c_str(), instance.c_str());
-}
-
-/** Small helper that we can new/delete to work better with C stuff */
-struct StartCHelper
-{
-    std::shared_ptr<Upstart> ptr;
-};
-
-/** Callback from starting an application. It checks to see whether the
-    app is already running. If it is already running then we need to send
-    the URLs to it via DBus.
-
-    \param obj The GDBusConnection object
-    \param res Async result object
-    \param user_data A pointer to a StartCHelper structure
-*/
-void Upstart::application_start_cb(GObject* obj, GAsyncResult* res, gpointer user_data)
-{
-    auto data = static_cast<StartCHelper*>(user_data);
-    GError* error{nullptr};
-    GVariant* result{nullptr};
-
-    tracepoint(ubuntu_app_launch, libual_start_message_callback, std::string(data->ptr->appId_).c_str());
-
-    g_debug("Started Message Callback: %s", std::string(data->ptr->appId_).c_str());
-
-    result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(obj), res, &error);
-
-    g_clear_pointer(&result, g_variant_unref);
-
-    if (error != nullptr)
-    {
-        if (g_dbus_error_is_remote_error(error))
-        {
-            gchar* remote_error = g_dbus_error_get_remote_error(error);
-            g_debug("Remote error: %s", remote_error);
-            if (g_strcmp0(remote_error, "com.ubuntu.Upstart0_6.Error.AlreadyStarted") == 0)
-            {
-                auto urls = urlsToStrv(data->ptr->urls_);
-                second_exec(data->ptr->registry_->impl->_dbus.get(),                   /* DBus */
-                            data->ptr->registry_->impl->thread.getCancellable().get(), /* cancellable */
-                            data->ptr->primaryPid(),                                   /* primary pid */
-                            std::string(data->ptr->appId_).c_str(),                    /* appid */
-                            std::string(data->ptr->instance_).c_str(),                 /* instance */
-                            urls.get());                                               /* urls */
-            }
-
-            g_free(remote_error);
-        }
-        else
-        {
-            g_warning("Unable to emit event to start application: %s", error->message);
-        }
-        g_error_free(error);
-    }
-
-    delete data;
-}
-
-std::string Upstart::upstartJobPath()
-{
-    auto manager = std::dynamic_pointer_cast<manager::Upstart>(registry_->impl->jobs);
-    return manager->upstartJobPath(job_);
-}
-
-/** Go through the list of PIDs calling a function and handling
-    the issue with getting PIDs being a racey condition.
-
-    \param eachPid Function to run on each PID
-*/
-std::vector<pid_t> Upstart::forAllPids(const std::shared_ptr<Registry>& reg,
-                                       const AppID& appid,
-                                       const std::string& jobpath,
-                                       std::function<void(pid_t)> eachPid)
-{
-    std::set<pid_t> seenPids;
-    bool added = true;
-
-    while (added)
-    {
-        added = false;
-        auto pidlist = pids(reg, appid, jobpath);
-        for (auto pid : pidlist)
-        {
-            if (seenPids.insert(pid).second)
-            {
-                eachPid(pid);
-                added = true;
-            }
-        }
-    }
-
-    return std::vector<pid_t>(seenPids.begin(), seenPids.end());
-}
-
-/** Pauses this application by sending SIGSTOP to all the PIDs in the
-    cgroup and tells Zeitgeist that we've left the application. */
-void Upstart::pause()
-{
-    g_debug("Pausing application: %s", std::string(appId_).c_str());
-
-    auto registry = registry_;
-    auto appid = appId_;
-    auto instance = instance_;
-    auto jobpath = upstartJobPath();
-
-    registry->impl->thread.executeOnThread([registry, appid, instance, jobpath] {
-        auto pids = forAllPids(registry, appid, jobpath, [](pid_t pid) {
-            auto oomval = oom::paused();
-            g_debug("Pausing PID: %d (%d)", pid, int(oomval));
-            signalToPid(pid, SIGSTOP);
-            oomValueToPid(pid, oomval);
-        });
-
-        pidListToDbus(registry, appid, instance, pids, "ApplicationPaused");
-    });
-
-    registry_->impl->zgSendEvent(appId_, ZEITGEIST_ZG_LEAVE_EVENT);
-}
-
-/** Resumes this application by sending SIGCONT to all the PIDs in the
-    cgroup and tells Zeitgeist that we're accessing the application. */
-void Upstart::resume()
-{
-    g_debug("Resuming application: %s", std::string(appId_).c_str());
-
-    auto registry = registry_;
-    auto appid = appId_;
-    auto instance = instance_;
-    auto jobpath = upstartJobPath();
-
-    registry->impl->thread.executeOnThread([registry, appid, instance, jobpath] {
-        auto pids = forAllPids(registry, appid, jobpath, [](pid_t pid) {
-            auto oomval = oom::focused();
-            g_debug("Resuming PID: %d (%d)", pid, int(oomval));
-            signalToPid(pid, SIGCONT);
-            oomValueToPid(pid, oomval);
-        });
-
-        pidListToDbus(registry, appid, instance, pids, "ApplicationResumed");
-    });
-
-    registry_->impl->zgSendEvent(appId_, ZEITGEIST_ZG_ACCESS_EVENT);
-}
-
-std::vector<pid_t> Upstart::pids(const std::shared_ptr<Registry>& reg, const AppID& appid, const std::string& jobpath)
-{
-    auto manager = std::dynamic_pointer_cast<manager::Upstart>(reg->impl->jobs);
-    auto pids = manager->pidsFromCgroup(jobpath);
-    g_debug("Got %d PIDs for AppID '%s'", int(pids.size()), std::string(appid).c_str());
-    return pids;
-}
-
-}  // namespace instances
-
-namespace manager
-{
-
-Upstart::Upstart(std::shared_ptr<Registry> registry)
-    : Base(registry)
-{
-}
-
-Upstart::~Upstart()
-{
-    auto dohandle = [&](guint& handle) {
-        if (handle != 0)
-        {
-            g_dbus_connection_signal_unsubscribe(dbus_.get(), handle);
-            handle = 0;
-        }
-    };
-
-    dohandle(handle_appStarted);
-    dohandle(handle_appStopped);
-    dohandle(handle_appFailed);
-}
-
-/** Launch an application and create a new Upstart instance object to track
-    its progress.
-
-    \param appId Application ID
-    \param job Upstart job name
-    \param instance Upstart instance name
-    \param urls URLs sent to the application (only on launch today)
-    \param mode Whether or not to setup the environment for testing
-    \param getenv A function to get additional environment variable when appropriate
-*/
-std::shared_ptr<Application::Instance> Upstart::launch(
-    const AppID& appId,
-    const std::string& job,
-    const std::string& instance,
-    const std::vector<Application::URL>& urls,
-    launchMode mode,
-    std::function<std::list<std::pair<std::string, std::string>>(void)>& getenv)
-{
-    if (appId.empty())
-        return {};
-
-    auto registry = registry_.lock();
-
-    if (!registry)
-    {
-        g_warning("Registry object invalid!");
-        return {};
-    }
-
-    return registry->impl->thread.executeOnThread<std::shared_ptr<instance::Upstart>>(
-        [&]() -> std::shared_ptr<instance::Upstart> {
-            auto manager = std::dynamic_pointer_cast<manager::Upstart>(registry->impl->jobs);
-            std::string appIdStr{appId};
-            g_debug("Initializing params for an new instance::Upstart for: %s", appIdStr.c_str());
-
-            tracepoint(ubuntu_app_launch, libual_start, appIdStr.c_str());
-
-            int timeout = 1;
-            if (ubuntu::app_launch::Registry::Impl::isWatchingAppStarting())
-            {
-                timeout = 0;
-            }
-
-            auto handshake = starting_handshake_start(appIdStr.c_str(), instance.c_str(), timeout);
-            if (handshake == nullptr)
-            {
-                g_warning("Unable to setup starting handshake");
-            }
-
-            /* Figure out the DBus path for the job */
-            auto jobpath = manager->upstartJobPath(job);
-
-            /* Build up our environment */
-            auto env = getenv();
-
-            env.emplace_back(std::make_pair("APP_ID", appIdStr));                           /* Application ID */
-            env.emplace_back(std::make_pair("APP_LAUNCHER_PID", std::to_string(getpid()))); /* Who we are, for bugs */
-
-            if (!urls.empty())
-            {
-                auto accumfunc = [](const std::string& prev, Application::URL thisurl) -> std::string {
-                    gchar* gescaped = g_shell_quote(thisurl.value().c_str());
-                    std::string escaped;
-                    if (gescaped != nullptr)
-                    {
-                        escaped = gescaped;
-                        g_free(gescaped);
-                    }
-                    else
-                    {
-                        g_warning("Unable to escape URL: %s", thisurl.value().c_str());
-                        return prev;
-                    }
-
-                    if (prev.empty())
-                    {
-                        return escaped;
-                    }
-                    else
-                    {
-                        return prev + " " + escaped;
-                    }
-                };
-                auto urlstring = std::accumulate(urls.begin(), urls.end(), std::string{}, accumfunc);
-                env.emplace_back(std::make_pair("APP_URIS", urlstring));
-            }
-
-            if (mode == launchMode::TEST)
-            {
-                env.emplace_back(std::make_pair("QT_LOAD_TESTABILITY", "1"));
-            }
-
-            /* Convert to GVariant */
-            GVariantBuilder builder;
-            g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
-
-            g_variant_builder_open(&builder, G_VARIANT_TYPE_ARRAY);
-
-            for (const auto& envvar : env)
-            {
-                g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf(
-                                                          "%s=%s", envvar.first.c_str(), envvar.second.c_str())));
-            }
-
-            g_variant_builder_close(&builder);
-            g_variant_builder_add_value(&builder, g_variant_new_boolean(TRUE));
-
-            auto retval = std::make_shared<instance::Upstart>(appId, job, instance, urls, registry);
-            auto chelper = new instance::StartCHelper{};
-            chelper->ptr = retval;
-
-            tracepoint(ubuntu_app_launch, handshake_wait, appIdStr.c_str());
-            starting_handshake_wait(handshake);
-            tracepoint(ubuntu_app_launch, handshake_complete, appIdStr.c_str());
-
-            /* Call the job start function */
-            g_debug("Asking Upstart to start task for: %s", appIdStr.c_str());
-            g_dbus_connection_call(registry->impl->_dbus.get(),                   /* bus */
-                                   DBUS_SERVICE_UPSTART,                          /* service name */
-                                   jobpath.c_str(),                               /* Path */
-                                   DBUS_INTERFACE_UPSTART_JOB,                    /* interface */
-                                   "Start",                                       /* method */
-                                   g_variant_builder_end(&builder),               /* params */
-                                   nullptr,                                       /* return */
-                                   G_DBUS_CALL_FLAGS_NONE,                        /* flags */
-                                   -1,                                            /* default timeout */
-                                   registry->impl->thread.getCancellable().get(), /* cancellable */
-                                   instance::Upstart::application_start_cb,       /* callback */
-                                   chelper                                        /* object */
-                                   );
-
-            tracepoint(ubuntu_app_launch, libual_start_message_sent, appIdStr.c_str());
-
-            return retval;
-        });
-}
-
-/** Special characters that could be an application name that
-    would activate in a regex */
-const static std::regex regexCharacters("([\\.\\-])");
-
-std::shared_ptr<Application::Instance> Upstart::existing(const AppID& appId,
-                                                         const std::string& job,
-                                                         const std::string& instance,
-                                                         const std::vector<Application::URL>& urls)
-{
-    return std::make_shared<instance::Upstart>(appId, job, instance, urls, registry_.lock());
-}
-
-std::vector<std::shared_ptr<instance::Base>> Upstart::instances(const AppID& appID, const std::string& job)
-{
-    std::vector<std::shared_ptr<instance::Base>> vect;
-    auto startsWith = std::string(appID);
-    if (job != "application-click")
-    {
-        startsWith += "-";
-    }
-
-    auto regexstr =
-        std::string{"^(?:"} + std::regex_replace(startsWith, regexCharacters, "\\$&") + std::string{")(\\d*)$"};
-    auto instanceRegex = std::regex(regexstr);
-
-    for (auto instance : upstartInstancesForJob(job))
-    {
-        std::smatch instanceMatch;
-        g_debug("Looking at job '%s' instance: %s", job.c_str(), instance.c_str());
-        if (std::regex_match(instance, instanceMatch, instanceRegex))
-        {
-            auto app = existing(appID, job, instanceMatch[1].str(), {});
-            vect.emplace_back(std::dynamic_pointer_cast<instance::Base>(app));
-        }
-    }
-
-    g_debug("App '%s' has %d instances", std::string(appID).c_str(), int(vect.size()));
-
-    return vect;
-}
-
-/** Structure to track the data needed for upstart events. This cleans
-    up the lifecycle as we're passing this as a pointer through the
-    GLib calls. */
-struct upstartEventData
-{
-    /** Keeping a weak pointer because the handle is held by
-        the registry implementation. */
-    std::weak_ptr<Registry> weakReg;
-};
-
-/** Regex to parse the JOB environment variable from Upstart */
-const std::regex jobenv_regex{"^JOB=(application\\-(?:click|snap|legacy))$"};
-/** Regex to parse the INSTANCE environment variable from Upstart */
-const std::regex instanceenv_regex{"^INSTANCE=(.*?)(?:\\-([0-9]*))?+$"};
-
-/** Core of most of the events that come from Upstart directly. Includes parsing of the
-    Upstart event environment and calling the appropriate signal with the right Application
-    object and eventually its instance */
-void Upstart::upstartEventEmitted(
-    core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& signal,
-    std::shared_ptr<GVariant> params,
-    const std::shared_ptr<Registry>& reg)
-{
-    std::string jobname;
-    std::string sappid;
-    std::string instance;
-
-    gchar* env = nullptr;
-    auto envs = g_variant_get_child_value(params.get(), 1);
-    GVariantIter iter;
-    g_variant_iter_init(&iter, envs);
-
-    while (g_variant_iter_loop(&iter, "s", &env))
-    {
-        std::smatch match;
-        std::string senv = env;
-
-        if (std::regex_match(senv, match, jobenv_regex))
-        {
-            jobname = match[1].str();
-        }
-        else if (std::regex_match(senv, match, instanceenv_regex))
-        {
-            sappid = match[1].str();
-            instance = match[2].str();
-        }
-    }
-
-    g_variant_unref(envs);
-
-    if (jobname.empty())
-    {
-        return;
-    }
-
-    g_debug("Upstart Event for job '%s' appid '%s' instance '%s'", jobname.c_str(), sappid.c_str(), instance.c_str());
-
-    auto appid = AppID::find(reg, sappid);
-    auto app = Application::create(appid, reg);
-    auto inst = std::dynamic_pointer_cast<app_impls::Base>(app)->findInstance(instance);
-
-    signal(app, inst);
-}
-
-/** Grab the signal object for application startup. If we're not already listing for
-    those signals this sets up a listener for them. */
-core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& Upstart::appStarted()
-{
-    std::call_once(flag_appStarted, [this]() {
-        auto reg = registry_.lock();
-
-        reg->impl->thread.executeOnThread<bool>([this, reg]() {
-            upstartEventData* data = new upstartEventData{reg};
-
-            handle_appStarted = g_dbus_connection_signal_subscribe(
-                reg->impl->_dbus.get(), /* bus */
-                nullptr,                /* sender */
-                DBUS_INTERFACE_UPSTART, /* interface */
-                "EventEmitted",         /* signal */
-                DBUS_PATH_UPSTART,      /* path */
-                "started",              /* arg0 */
-                G_DBUS_SIGNAL_FLAGS_NONE,
-                [](GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant* params,
-                   gpointer user_data) {
-                    auto data = static_cast<upstartEventData*>(user_data);
-                    auto reg = data->weakReg.lock();
-
-                    if (!reg)
-                    {
-                        g_warning("Registry object invalid!");
-                        return;
-                    }
-
-                    auto sparams = std::shared_ptr<GVariant>(g_variant_ref(params), g_variant_unref);
-                    auto upstart = std::dynamic_pointer_cast<Upstart>(reg->impl->jobs);
-                    upstart->upstartEventEmitted(upstart->sig_appStarted, sparams, reg);
-                },    /* callback */
-                data, /* user data */
-                [](gpointer user_data) {
-                    auto data = static_cast<upstartEventData*>(user_data);
-                    delete data;
-                }); /* user data destroy */
-
-            return true;
-        });
-    });
-
-    return sig_appStarted;
-}
-
-/** Grab the signal object for application stopping. If we're not already listing for
-    those signals this sets up a listener for them. */
-core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& Upstart::appStopped()
-{
-    std::call_once(flag_appStopped, [this]() {
-        auto reg = registry_.lock();
-
-        reg->impl->thread.executeOnThread<bool>([this, reg]() {
-            upstartEventData* data = new upstartEventData{reg};
-
-            handle_appStopped = g_dbus_connection_signal_subscribe(
-                reg->impl->_dbus.get(), /* bus */
-                nullptr,                /* sender */
-                DBUS_INTERFACE_UPSTART, /* interface */
-                "EventEmitted",         /* signal */
-                DBUS_PATH_UPSTART,      /* path */
-                "stopped",              /* arg0 */
-                G_DBUS_SIGNAL_FLAGS_NONE,
-                [](GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant* params,
-                   gpointer user_data) {
-                    auto data = static_cast<upstartEventData*>(user_data);
-                    auto reg = data->weakReg.lock();
-
-                    if (!reg)
-                    {
-                        g_warning("Registry object invalid!");
-                        return;
-                    }
-
-                    auto sparams = std::shared_ptr<GVariant>(g_variant_ref(params), g_variant_unref);
-                    auto upstart = std::dynamic_pointer_cast<Upstart>(reg->impl->jobs);
-                    upstart->upstartEventEmitted(upstart->sig_appStopped, sparams, reg);
-                },    /* callback */
-                data, /* user data */
-                [](gpointer user_data) {
-                    auto data = static_cast<upstartEventData*>(user_data);
-                    delete data;
-                }); /* user data destroy */
-
-            return true;
-        });
-    });
-
-    return sig_appStopped;
-}
-
-/** Grab the signal object for application failing. If we're not already listing for
-    those signals this sets up a listener for them. */
-core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&, Registry::FailureType>&
-    Upstart::appFailed()
-{
-    std::call_once(flag_appFailed, [this]() {
-        auto reg = registry_.lock();
-
-        reg->impl->thread.executeOnThread<bool>([this, reg]() {
-            upstartEventData* data = new upstartEventData{reg};
-
-            handle_appFailed = g_dbus_connection_signal_subscribe(
-                reg->impl->_dbus.get(),          /* bus */
-                nullptr,                         /* sender */
-                "com.canonical.UbuntuAppLaunch", /* interface */
-                "ApplicationFailed",             /* signal */
-                "/",                             /* path */
-                nullptr,                         /* arg0 */
-                G_DBUS_SIGNAL_FLAGS_NONE,
-                [](GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant* params,
-                   gpointer user_data) {
-                    auto data = static_cast<upstartEventData*>(user_data);
-                    auto reg = data->weakReg.lock();
-
-                    if (!reg)
-                    {
-                        g_warning("Registry object invalid!");
-                        return;
-                    }
-
-                    const gchar* sappid = nullptr;
-                    const gchar* sinstid = nullptr;
-                    const gchar* typestr = nullptr;
-
-                    Registry::FailureType type = Registry::FailureType::CRASH;
-                    g_variant_get(params, "(&s&s&s)", &sappid, &sinstid, &typestr);
-
-                    if (g_strcmp0("crash", typestr) == 0)
-                    {
-                        type = Registry::FailureType::CRASH;
-                    }
-                    else if (g_strcmp0("start-failure", typestr) == 0)
-                    {
-                        type = Registry::FailureType::START_FAILURE;
-                    }
-                    else
-                    {
-                        g_warning("Application failure type '%s' unknown, reporting as a crash", typestr);
-                    }
-
-                    auto appid = AppID::find(reg, sappid);
-                    auto app = Application::create(appid, reg);
-                    auto inst = std::dynamic_pointer_cast<app_impls::Base>(app)->findInstance(sinstid);
-
-                    auto upstart = std::dynamic_pointer_cast<Upstart>(reg->impl->jobs);
-                    upstart->sig_appFailed(app, {}, type);
-                },    /* callback */
-                data, /* user data */
-                [](gpointer user_data) {
-                    auto data = static_cast<upstartEventData*>(user_data);
-                    delete data;
-                }); /* user data destroy */
-
-            return true;
-        });
-    });
-
-    return sig_appFailed;
-}
-
-/** Initialize the CGManager connection, including a timeout to disconnect
-    as CGManager doesn't free resources entirely well. So it's better if
-    we connect and disconnect occationally */
-void Upstart::initCGManager()
-{
-    if (cgManager_)
-        return;
-
-    auto registry = registry_.lock();
-
-    cgManager_ = registry->impl->thread.executeOnThread<std::shared_ptr<GDBusConnection>>([this, registry]() {
-        bool use_session_bus = g_getenv("UBUNTU_APP_LAUNCH_CG_MANAGER_SESSION_BUS") != nullptr;
-        if (use_session_bus)
-        {
-            /* For working dbusmock */
-            g_debug("Connecting to CG Manager on session bus");
-            return registry->impl->_dbus;
-        }
-
-        auto cancel =
-            std::shared_ptr<GCancellable>(g_cancellable_new(), [](GCancellable* cancel) { g_clear_object(&cancel); });
-
-        /* Ensure that we do not wait for more than a second */
-        registry->impl->thread.timeoutSeconds(std::chrono::seconds{1},
-                                              [cancel]() { g_cancellable_cancel(cancel.get()); });
-
-        GError* error = nullptr;
-        auto retval = std::shared_ptr<GDBusConnection>(
-            g_dbus_connection_new_for_address_sync(CGMANAGER_DBUS_PATH,                           /* cgmanager path */
-                                                   G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, /* flags */
-                                                   nullptr,                                       /* Auth Observer */
-                                                   cancel.get(),                                  /* Cancellable */
-                                                   &error),
-            [](GDBusConnection* con) { g_clear_object(&con); });
-
-        if (error != nullptr)
-        {
-            g_warning("Unable to get CGManager connection: %s", error->message);
-            g_error_free(error);
-        }
-
-        return retval;
-    });
-
-    /* NOTE: This will execute on the thread */
-    registry->impl->thread.timeoutSeconds(std::chrono::seconds{10}, [this]() { cgManager_.reset(); });
-}
-
-/** Get a list of PIDs from a CGroup, uses the CGManager connection to list
-    all of the PIDs. It is important to note that this is an IPC call, so it can
-    by its nature, be racy. Once the message has been sent the group can change.
-    You should take that into account in your usage of it. */
-std::vector<pid_t> Upstart::pidsFromCgroup(const std::string& jobpath)
-{
-    initCGManager();
-    auto lmanager = cgManager_; /* Grab a local copy so we ensure it lasts through our lifetime */
-    auto registry = registry_.lock();
-
-    return registry->impl->thread.executeOnThread<std::vector<pid_t>>([&jobpath, lmanager]() -> std::vector<pid_t> {
-        GError* error = nullptr;
-        const gchar* name = g_getenv("UBUNTU_APP_LAUNCH_CG_MANAGER_NAME");
-        std::string groupname;
-        if (!jobpath.empty())
-        {
-            groupname = "upstart/" + jobpath;
-        }
-
-        g_debug("Looking for cg manager '%s' group '%s'", name, groupname.c_str());
-
-        auto vtpids = g_dbus_connection_call_sync(
-            lmanager.get(),                     /* connection */
-            name,                               /* bus name for direct connection is nullptr */
-            "/org/linuxcontainers/cgmanager",   /* object */
-            "org.linuxcontainers.cgmanager0_0", /* interface */
-            "GetTasksRecursive",                /* method */
-            g_variant_new("(ss)", "freezer", groupname.empty() ? "" : groupname.c_str()), /* params */
-            G_VARIANT_TYPE("(ai)"),                                                       /* output */
-            G_DBUS_CALL_FLAGS_NONE,                                                       /* flags */
-            -1,                                                                           /* default timeout */
-            nullptr,                                                                      /* cancellable */
-            &error);                                                                      /* error */
-
-        if (error != nullptr)
-        {
-            g_warning("Unable to get PID list from cgroup manager: %s", error->message);
-            g_error_free(error);
-            return {};
-        }
-
-        auto vpids = g_variant_get_child_value(vtpids, 0);
-        GVariantIter iter;
-        g_variant_iter_init(&iter, vpids);
-        gint32 pid;
-        std::vector<pid_t> pids;
-
-        while (g_variant_iter_loop(&iter, "i", &pid))
-        {
-            pids.push_back(pid);
-        }
-
-        g_variant_unref(vpids);
-        g_variant_unref(vtpids);
-
-        return pids;
-    });
-}
-
-/** Looks to find the Upstart object path for a specific Upstart job. This first
-    checks the cache, and otherwise does the lookup on DBus. */
-std::string Upstart::upstartJobPath(const std::string& job)
-{
-    try
-    {
-        return upstartJobPathCache_.at(job);
-    }
-    catch (std::out_of_range& e)
-    {
-        auto registry = registry_.lock();
-        auto path = registry->impl->thread.executeOnThread<std::string>([this, &job, &registry]() -> std::string {
-            GError* error = nullptr;
-            auto job_path_variant =
-                g_dbus_connection_call_sync(registry->impl->_dbus.get(),                   /* connection */
-                                            DBUS_SERVICE_UPSTART,                          /* service */
-                                            DBUS_PATH_UPSTART,                             /* path */
-                                            DBUS_INTERFACE_UPSTART,                        /* iface */
-                                            "GetJobByName",                                /* method */
-                                            g_variant_new("(s)", job.c_str()),             /* params */
-                                            G_VARIANT_TYPE("(o)"),                         /* return */
-                                            G_DBUS_CALL_FLAGS_NONE,                        /* flags */
-                                            -1,                                            /* timeout: default */
-                                            registry->impl->thread.getCancellable().get(), /* cancellable */
-                                            &error);                                       /* error */
-
-            if (error != nullptr)
-            {
-                g_warning("Unable to find job '%s': %s", job.c_str(), error->message);
-                g_error_free(error);
-                return {};
-            }
-
-            gchar* job_path = nullptr;
-            g_variant_get(job_path_variant, "(o)", &job_path);
-            g_variant_unref(job_path_variant);
-
-            if (job_path != nullptr)
-            {
-                std::string path(job_path);
-                g_free(job_path);
-                return path;
-            }
-            else
-            {
-                return {};
-            }
-        });
-
-        upstartJobPathCache_[job] = path;
-        return path;
-    }
-}
-
-/** Queries Upstart to get all the instances of a given job. This
-    can take a while as the number of dbus calls is n+1. It is
-    rare that apps have many instances though. */
-std::list<std::string> Upstart::upstartInstancesForJob(const std::string& job)
-{
-    std::string jobpath = upstartJobPath(job);
-    if (jobpath.empty())
-    {
-        return {};
-    }
-
-    auto registry = registry_.lock();
-    return registry->impl->thread.executeOnThread<std::list<std::string>>(
-        [this, &job, &jobpath, &registry]() -> std::list<std::string> {
-            GError* error = nullptr;
-            auto instance_tuple =
-                g_dbus_connection_call_sync(registry->impl->_dbus.get(),                   /* connection */
-                                            DBUS_SERVICE_UPSTART,                          /* service */
-                                            jobpath.c_str(),                               /* object path */
-                                            DBUS_INTERFACE_UPSTART_JOB,                    /* iface */
-                                            "GetAllInstances",                             /* method */
-                                            nullptr,                                       /* params */
-                                            G_VARIANT_TYPE("(ao)"),                        /* return type */
-                                            G_DBUS_CALL_FLAGS_NONE,                        /* flags */
-                                            -1,                                            /* timeout: default */
-                                            registry->impl->thread.getCancellable().get(), /* cancellable */
-                                            &error);
-
-            if (error != nullptr)
-            {
-                g_warning("Unable to get instances of job '%s': %s", job.c_str(), error->message);
-                g_error_free(error);
-                return {};
-            }
-
-            if (instance_tuple == nullptr)
-            {
-                return {};
-            }
-
-            auto instance_list = g_variant_get_child_value(instance_tuple, 0);
-            g_variant_unref(instance_tuple);
-
-            GVariantIter instance_iter;
-            g_variant_iter_init(&instance_iter, instance_list);
-            const gchar* instance_path = nullptr;
-            std::list<std::string> instances;
-
-            while (g_variant_iter_loop(&instance_iter, "&o", &instance_path))
-            {
-                auto props_tuple =
-                    g_dbus_connection_call_sync(registry->impl->_dbus.get(),                           /* connection */
-                                                DBUS_SERVICE_UPSTART,                                  /* service */
-                                                instance_path,                                         /* object path */
-                                                "org.freedesktop.DBus.Properties",                     /* interface */
-                                                "GetAll",                                              /* method */
-                                                g_variant_new("(s)", DBUS_INTERFACE_UPSTART_INSTANCE), /* params */
-                                                G_VARIANT_TYPE("(a{sv})"),                             /* return type */
-                                                G_DBUS_CALL_FLAGS_NONE,                                /* flags */
-                                                -1,                                            /* timeout: default */
-                                                registry->impl->thread.getCancellable().get(), /* cancellable */
-                                                &error);
-
-                if (error != nullptr)
-                {
-                    g_warning("Unable to name of instance '%s': %s", instance_path, error->message);
-                    g_error_free(error);
-                    error = nullptr;
-                    continue;
-                }
-
-                auto props_dict = g_variant_get_child_value(props_tuple, 0);
-
-                auto namev = g_variant_lookup_value(props_dict, "name", G_VARIANT_TYPE_STRING);
-                if (namev != nullptr)
-                {
-                    auto name = g_variant_get_string(namev, nullptr);
-                    g_debug("Adding instance for job '%s': %s", job.c_str(), name);
-                    instances.push_back(name);
-                    g_variant_unref(namev);
-                }
-
-                g_variant_unref(props_dict);
-                g_variant_unref(props_tuple);
-            }
-
-            g_variant_unref(instance_list);
-
-            return instances;
-        });
-}
-
-std::list<std::shared_ptr<Application>> Upstart::runningApps()
-{
-    std::list<std::string> instances;
-
-    /* Get all the legacy instances */
-    instances.splice(instances.begin(), upstartInstancesForJob("application-legacy"));
-    /* Get all the snap instances */
-    instances.splice(instances.begin(), upstartInstancesForJob("application-snap"));
-
-    /* Remove the instance ID */
-    std::transform(instances.begin(), instances.end(), instances.begin(), [](std::string& instancename) -> std::string {
-        static const std::regex instanceregex("^(.*)-[0-9]*$");
-        std::smatch match;
-        if (std::regex_match(instancename, match, instanceregex))
-        {
-            return match[1].str();
-        }
-        else
-        {
-            g_warning("Unable to match instance name: %s", instancename.c_str());
-            return {};
-        }
-    });
-
-    /* Deduplicate Set */
-    std::set<std::string> instanceset;
-    for (auto instance : instances)
-    {
-        if (!instance.empty())
-            instanceset.insert(instance);
-    }
-
-    /* Add in the click instances */
-    for (auto instance : upstartInstancesForJob("application-click"))
-    {
-        instanceset.insert(instance);
-    }
-
-    g_debug("Overall there are %d instances: %s", int(instanceset.size()),
-            std::accumulate(instanceset.begin(), instanceset.end(), std::string{}, [](const std::string& instr,
-                                                                                      std::string instance) {
-                return instr.empty() ? instance : instr + ", " + instance;
-            }).c_str());
-
-    /* Convert to Applications */
-    auto registry = registry_.lock();
-    std::list<std::shared_ptr<Application>> apps;
-    for (auto instance : instanceset)
-    {
-        auto appid = AppID::find(registry, instance);
-        auto app = Application::create(appid, registry);
-        apps.push_back(app);
-    }
-
-    return apps;
-}
-
-}  // namespace manager
-}  // namespace jobs
-}  // namespace app_launch
-}  // namespace ubuntu

=== removed file 'libubuntu-app-launch/jobs-upstart.h'
--- libubuntu-app-launch/jobs-upstart.h	2017-01-11 22:16:14 +0000
+++ libubuntu-app-launch/jobs-upstart.h	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright © 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#pragma once
-
-#include "jobs-base.h"
-#include <gio/gio.h>
-#include <map>
-
-namespace ubuntu
-{
-namespace app_launch
-{
-namespace jobs
-{
-namespace manager
-{
-
-class Upstart : public Base
-{
-public:
-    Upstart(std::shared_ptr<Registry> registry);
-    virtual ~Upstart();
-
-    virtual std::shared_ptr<Application::Instance> launch(
-        const AppID& appId,
-        const std::string& job,
-        const std::string& instance,
-        const std::vector<Application::URL>& urls,
-        launchMode mode,
-        std::function<std::list<std::pair<std::string, std::string>>(void)>& getenv) override;
-    virtual std::shared_ptr<Application::Instance> existing(const AppID& appId,
-                                                            const std::string& job,
-                                                            const std::string& instance,
-                                                            const std::vector<Application::URL>& urls) override;
-
-    virtual std::list<std::shared_ptr<Application>> runningApps() override;
-
-    virtual std::vector<std::shared_ptr<instance::Base>> instances(const AppID& appID, const std::string& job) override;
-
-    /* Signals to apps */
-    virtual core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>&
-        appStarted() override;
-    virtual core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>&
-        appStopped() override;
-    virtual core::Signal<const std::shared_ptr<Application>&,
-                         const std::shared_ptr<Application::Instance>&,
-                         Registry::FailureType>&
-        appFailed() override;
-
-    std::vector<pid_t> pidsFromCgroup(const std::string& jobpath);
-
-    std::list<std::string> upstartInstancesForJob(const std::string& job);
-    std::string upstartJobPath(const std::string& job);
-
-private:
-    void initCGManager();
-
-    std::shared_ptr<GDBusConnection> cgManager_;
-
-    /** Getting the Upstart job path is relatively expensive in
-        that it requires a DBus call. Worth keeping a cache of. */
-    std::map<std::string, std::string> upstartJobPathCache_;
-
-    guint handle_appStarted{0}; /**< GDBus signal watcher handle for app started signal */
-    guint handle_appStopped{0}; /**< GDBus signal watcher handle for app stopped signal */
-    guint handle_appFailed{0};  /**< GDBus signal watcher handle for app failed signal */
-
-    std::once_flag flag_appStarted; /**< Variable to track to see if signal handlers are installed for application
-                                       started */
-    std::once_flag flag_appStopped; /**< Variable to track to see if signal handlers are installed for application
-                                       stopped */
-    std::once_flag
-        flag_appFailed; /**< Variable to track to see if signal handlers are installed for application failed */
-
-    void upstartEventEmitted(
-        core::Signal<const std::shared_ptr<Application>&, const std::shared_ptr<Application::Instance>&>& signal,
-        std::shared_ptr<GVariant> params,
-        const std::shared_ptr<Registry>& reg);
-};
-
-}  // namespace manager
-}  // namespace jobs
-}  // namespace app_launch
-}  // namespace ubuntu

=== modified file 'libubuntu-app-launch/registry.cpp'
--- libubuntu-app-launch/registry.cpp	2017-01-11 22:16:14 +0000
+++ libubuntu-app-launch/registry.cpp	2017-02-22 21:41:30 +0000
@@ -31,8 +31,6 @@
 #include "application-impl-snap.h"
 #endif
 
-#include "helper-impl-click.h"
-
 namespace ubuntu
 {
 namespace app_launch
@@ -71,13 +69,14 @@
     return list;
 }
 
-std::list<std::shared_ptr<Helper>> Registry::runningHelpers(Helper::Type type, std::shared_ptr<Registry> connection)
+std::list<std::shared_ptr<Helper>> Registry::runningHelpers(Helper::Type type, std::shared_ptr<Registry> registry)
 {
-    std::list<std::shared_ptr<Helper>> list;
-
-    list.splice(list.begin(), helper_impls::Click::running(type, connection));
-
-    return list;
+    if (!registry->impl->jobs)
+    {
+        registry->impl->jobs = jobs::manager::Base::determineFactory(registry);
+    }
+
+    return registry->impl->jobs->runningHelpers(type);
 }
 
 /* Quick little helper to bundle up standard code */
@@ -160,5 +159,26 @@
     return reg->impl->jobs->appResumed();
 }
 
+core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& Registry::helperStarted(
+    Helper::Type type, const std::shared_ptr<Registry>& reg)
+{
+    setJobs(reg);
+    return reg->impl->jobs->helperStarted(type);
+}
+
+core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& Registry::helperStopped(
+    Helper::Type type, const std::shared_ptr<Registry>& reg)
+{
+    setJobs(reg);
+    return reg->impl->jobs->helperStopped(type);
+}
+
+core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&, Registry::FailureType>&
+    Registry::helperFailed(Helper::Type type, const std::shared_ptr<Registry>& reg)
+{
+    setJobs(reg);
+    return reg->impl->jobs->helperFailed(type);
+}
+
 }  // namespace app_launch
 }  // namespace ubuntu

=== modified file 'libubuntu-app-launch/registry.h'
--- libubuntu-app-launch/registry.h	2017-01-24 00:09:09 +0000
+++ libubuntu-app-launch/registry.h	2017-02-22 21:41:30 +0000
@@ -214,6 +214,37 @@
     static std::list<std::shared_ptr<Helper>> runningHelpers(Helper::Type type,
                                                              std::shared_ptr<Registry> registry = getDefault());
 
+    /** Get the signal object that is signaled when helper has been
+        started.
+
+        \note This signal handler is activated on the UAL thread
+
+        \param type Helper type string
+        \param reg Registry to get the handler from
+    */
+    static core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& helperStarted(
+        Helper::Type type, const std::shared_ptr<Registry>& reg = getDefault());
+
+    /** Get the signal object that is signaled when a helper has stopped.
+
+        \note This signal handler is activated on the UAL thread
+
+        \param type Helper type string
+        \param reg Registry to get the handler from
+    */
+    static core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&>& helperStopped(
+        Helper::Type type, const std::shared_ptr<Registry>& reg = getDefault());
+
+    /** Get the signal object that is signaled when a helper has failed.
+
+        \note This signal handler is activated on the UAL thread
+
+        \param type Helper type string
+        \param reg Registry to get the handler from
+    */
+    static core::Signal<const std::shared_ptr<Helper>&, const std::shared_ptr<Helper::Instance>&, FailureType>&
+        helperFailed(Helper::Type type, const std::shared_ptr<Registry>& reg = getDefault());
+
     /* Default Junk */
     /** Use the Registry as a global singleton, this function will create
         a Registry object if one doesn't exist. Use of this function is

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.cpp'
--- libubuntu-app-launch/ubuntu-app-launch.cpp	2017-02-02 15:09:59 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.cpp	2017-02-22 21:41:30 +0000
@@ -37,78 +37,22 @@
 /* C++ Interface */
 #include "application.h"
 #include "appid.h"
+#include "helper-impl.h"
 #include "registry.h"
 #include "registry-impl.h"
 #include <algorithm>
 
-static void free_helper (gpointer value);
-int kill (pid_t pid, int signal) noexcept;
-static gchar * escape_dbus_string (const gchar * input);
-
-G_DEFINE_QUARK(UBUNTU_APP_LAUNCH_PROXY_PATH, proxy_path)
-G_DEFINE_QUARK(UBUNTU_APP_LAUNCH_MIR_FD, mir_fd)
-
-/* Function to take the urls and escape them so that they can be
-   parsed on the other side correctly. */
-static gchar *
-app_uris_string (const gchar * const * uris)
-{
-	guint i = 0;
-	GArray * array = g_array_new(TRUE, TRUE, sizeof(gchar *));
-	g_array_set_clear_func(array, free_helper);
-
-	for (i = 0; i < g_strv_length((gchar**)uris); i++) {
-		gchar * escaped = g_shell_quote(uris[i]);
-		g_array_append_val(array, escaped);
-	}
-
-	gchar * urisjoin = g_strjoinv(" ", (gchar**)array->data);
-	g_array_unref(array);
-
-	return urisjoin;
-}
-
-/* Get the path of the job from Upstart, if we've got it already, we'll just
-   use the cache of the value */
-static const gchar *
-get_jobpath (GDBusConnection * con, const gchar * jobname)
-{
-	gchar * cachepath = g_strdup_printf("ubuntu-app-lauch-job-path-cache-%s", jobname);
-	gpointer cachedata = g_object_get_data(G_OBJECT(con), cachepath);
-
-	if (cachedata != NULL) {
-		g_free(cachepath);
-		return (const gchar*)cachedata;
-	}
-
-	GError * error = NULL;
-	GVariant * job_path_variant = g_dbus_connection_call_sync(con,
-		DBUS_SERVICE_UPSTART,
-		DBUS_PATH_UPSTART,
-		DBUS_INTERFACE_UPSTART,
-		"GetJobByName",
-		g_variant_new("(s)", jobname),
-		G_VARIANT_TYPE("(o)"),
-		G_DBUS_CALL_FLAGS_NONE,
-		-1, /* timeout: default */
-		NULL, /* cancellable */
-		&error);
-
-	if (error != NULL) {	
-		g_warning("Unable to find job '%s': %s", jobname, error->message);
-		g_error_free(error);
-		g_free(cachepath);
-		return NULL;
-	}
-
-	gchar * job_path = NULL;
-	g_variant_get(job_path_variant, "(o)", &job_path);
-	g_variant_unref(job_path_variant);
-
-	g_object_set_data_full(G_OBJECT(con), cachepath, job_path, g_free);
-	g_free(cachepath);
-
-	return job_path;
+/* Make a typed string vector out of a GStrv */
+template <typename T>
+static std::vector<T> uriVector (const gchar * const * uris)
+{
+	std::vector<T> urivect;
+
+	for (auto i = 0; uris != nullptr && uris[i] != nullptr; i++) {
+		urivect.emplace_back(T::from_raw(uris[i]));
+	}
+
+	return urivect;
 }
 
 gboolean
@@ -119,11 +63,9 @@
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
 
-		std::vector<ubuntu::app_launch::Application::URL> urivect;
-		for (auto i = 0; uris != nullptr && uris[i] != nullptr; i++)
-			urivect.emplace_back(ubuntu::app_launch::Application::URL::from_raw(uris[i]));
+		auto uriv = uriVector<ubuntu::app_launch::Application::URL>(uris);
 
-		auto instance = app->launch(urivect);
+		auto instance = app->launch(uriv);
 
 		if (instance) {
 			return TRUE;
@@ -144,11 +86,9 @@
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
 
-		std::vector<ubuntu::app_launch::Application::URL> urivect;
-		for (auto i = 0; uris != nullptr && uris[i] != nullptr; i++)
-			urivect.emplace_back(ubuntu::app_launch::Application::URL::from_raw(uris[i]));
+		auto uriv = uriVector<ubuntu::app_launch::Application::URL>(uris);
 
-		auto instance = app->launchTest(urivect);
+		auto instance = app->launchTest(uriv);
 
 		if (instance) {
 			return TRUE;
@@ -161,13 +101,6 @@
 	}
 }
 
-static void
-free_helper (gpointer value)
-{
-	gchar ** strp = (gchar **)value;
-	g_free(*strp);
-}
-
 gboolean
 ubuntu_app_launch_stop_application (const gchar * appid)
 {
@@ -232,46 +165,6 @@
 	}
 }
 
-static GDBusConnection *
-gdbus_upstart_ref (void) {
-	static GDBusConnection * gdbus_upstart = NULL;
-
-	if (gdbus_upstart != NULL) {
-		return G_DBUS_CONNECTION(g_object_ref(gdbus_upstart));
-	}
-
-	GError * error = NULL;
-	gdbus_upstart = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
-
-	if (error != NULL) {
-		g_warning("Unable to connect to Upstart bus: %s", error->message);
-		g_error_free(error);
-		return NULL;
-	}
-
-	g_object_add_weak_pointer(G_OBJECT(gdbus_upstart), (void **)(&gdbus_upstart));
-
-	return gdbus_upstart;
-}
-
-/* The data we keep for each observer */
-typedef struct _observer_t observer_t;
-struct _observer_t {
-	GDBusConnection * conn;
-	guint sighandle;
-	UbuntuAppLaunchAppObserver func;
-	gpointer user_data;
-};
-
-/* The data we keep for each failed observer */
-typedef struct _failed_observer_t failed_observer_t;
-struct _failed_observer_t {
-	GDBusConnection * conn;
-	guint sighandle;
-	UbuntuAppLaunchAppFailedObserver func;
-	gpointer user_data;
-};
-
 /* Function to take a work function and have it execute on a given
    GMainContext */
 static void executeOnContext (const std::shared_ptr<GMainContext>& context, std::function<void()> work)
@@ -633,73 +526,6 @@
 	return observer_delete<UbuntuAppLaunchAppPausedResumedObserver>(observer, user_data, appResumedObservers);
 }
 
-typedef void (*per_instance_func_t) (GDBusConnection * con, GVariant * prop_dict, gpointer user_data);
-
-static void
-foreach_job_instance (GDBusConnection * con, const gchar * jobname, per_instance_func_t func, gpointer user_data)
-{
-	const gchar * job_path = get_jobpath(con, jobname);
-	if (job_path == NULL)
-		return;
-
-	GError * error = NULL;
-	GVariant * instance_tuple = g_dbus_connection_call_sync(con,
-		DBUS_SERVICE_UPSTART,
-		job_path,
-		DBUS_INTERFACE_UPSTART_JOB,
-		"GetAllInstances",
-		NULL,
-		G_VARIANT_TYPE("(ao)"),
-		G_DBUS_CALL_FLAGS_NONE,
-		-1, /* timeout: default */
-		NULL, /* cancellable */
-		&error);
-
-	if (error != NULL) {
-		g_warning("Unable to get instances of job '%s': %s", jobname, error->message);
-		g_error_free(error);
-		return;
-	}
-
-	GVariant * instance_list = g_variant_get_child_value(instance_tuple, 0);
-	g_variant_unref(instance_tuple);
-
-	GVariantIter instance_iter;
-	g_variant_iter_init(&instance_iter, instance_list);
-	const gchar * instance_path = NULL;
-
-	while (g_variant_iter_loop(&instance_iter, "&o", &instance_path)) {
-		GVariant * props_tuple = g_dbus_connection_call_sync(con,
-			DBUS_SERVICE_UPSTART,
-			instance_path,
-			"org.freedesktop.DBus.Properties",
-			"GetAll",
-			g_variant_new("(s)", DBUS_INTERFACE_UPSTART_INSTANCE),
-			G_VARIANT_TYPE("(a{sv})"),
-			G_DBUS_CALL_FLAGS_NONE,
-			-1, /* timeout: default */
-			NULL, /* cancellable */
-			&error);
-
-		if (error != NULL) {
-			g_warning("Unable to name of instance '%s': %s", instance_path, error->message);
-			g_error_free(error);
-			error = NULL;
-			continue;
-		}
-
-		GVariant * props_dict = g_variant_get_child_value(props_tuple, 0);
-
-		func(con, props_dict, user_data);
-
-		g_variant_unref(props_dict);
-		g_variant_unref(props_tuple);
-
-	}
-
-	g_variant_unref(instance_list);
-}
-
 gchar **
 ubuntu_app_launch_list_running_apps (void)
 {
@@ -832,79 +658,6 @@
 	return g_strdup(std::string(appid).c_str());
 }
 
-/* Print an error if we couldn't start it */
-static void
-start_helper_callback (GObject * obj, GAsyncResult * res, gpointer user_data)
-{
-	GError * error = NULL;
-	GVariant * result = NULL;
-
-	result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(obj), res, &error);
-	if (result != NULL)
-		g_variant_unref(result);
-
-	if (error != NULL) {
-		g_warning("Unable to start helper: %s", error->message);
-		g_error_free(error);
-	}
-}
-
-/* Implements sending the "start" command to Upstart for the
-   untrusted helper job with the various configuration options
-   to define the instance.  In the end there's only one job with
-   an array of instances. */
-static gboolean
-start_helper_core (const gchar * type, const gchar * appid, const gchar * const * uris, const gchar * instance, const gchar * mirsocketpath)
-{
-	GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(con != NULL, FALSE);
-
-	const gchar * jobpath = get_jobpath(con, "untrusted-helper");
-
-	/* Build up our environment */
-	GVariantBuilder builder;
-	g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
-	g_variant_builder_open(&builder, G_VARIANT_TYPE_ARRAY);
-	g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("APP_ID=%s", appid)));
-	g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("HELPER_TYPE=%s", type)));
-
-	if (uris != NULL) {
-		gchar * urisjoin = app_uris_string(uris);
-		g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("APP_URIS=%s", urisjoin)));
-		g_free(urisjoin);
-	}
-
-	if (instance != NULL) {
-		g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("INSTANCE_ID=%s", instance)));
-	}
-
-	if (mirsocketpath != NULL) {
-		g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("UBUNTU_APP_LAUNCH_DEMANGLE_PATH=%s", mirsocketpath)));
-		g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("UBUNTU_APP_LAUNCH_DEMANGLE_NAME=%s", g_dbus_connection_get_unique_name(con))));
-	}
-
-	g_variant_builder_close(&builder);
-	g_variant_builder_add_value(&builder, g_variant_new_boolean(TRUE));
-	
-	/* Call the job start function */
-	g_dbus_connection_call(con,
-	                       DBUS_SERVICE_UPSTART,
-	                       jobpath,
-	                       DBUS_INTERFACE_UPSTART_JOB,
-	                       "Start",
-	                       g_variant_builder_end(&builder),
-	                       NULL,
-	                       G_DBUS_CALL_FLAGS_NONE,
-	                       -1,
-	                       NULL, /* cancellable */
-	                       start_helper_callback,
-	                       NULL);
-
-	g_object_unref(con);
-
-	return TRUE;
-}
-
 gboolean
 ubuntu_app_launch_start_helper (const gchar * type, const gchar * appid, const gchar * const * uris)
 {
@@ -912,7 +665,27 @@
 	g_return_val_if_fail(appid != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, FALSE);
 
-	return start_helper_core(type, appid, uris, NULL, NULL);
+	try {
+		auto registry = ubuntu::app_launch::Registry::getDefault();
+		auto appId = ubuntu::app_launch::AppID::parse(appid);
+		auto helper = ubuntu::app_launch::Helper::create(ubuntu::app_launch::Helper::Type::from_raw(type), appId, registry);
+
+		if (!helper->instances().empty()) {
+			throw std::runtime_error{"Instance already exits"};
+		}
+
+		auto uriv = uriVector<ubuntu::app_launch::Helper::URL>(uris);
+		auto inst = helper->launch(uriv);
+
+		if (!inst) {
+			throw std::runtime_error{"Empty instance"};
+		}
+
+		return true;
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to launch helper of type '%s' id '%s': %s", type, appid, e.what());
+		return false;
+	}
 }
 
 gchar *
@@ -922,228 +695,23 @@
 	g_return_val_if_fail(appid != NULL, NULL);
 	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, NULL);
 
-	gchar * instanceid = g_strdup_printf("%" G_GUINT64_FORMAT, g_get_real_time());
-
-	if (start_helper_core(type, appid, uris, instanceid, NULL)) {
-		return instanceid;
-	}
-
-	g_free(instanceid);
-	return NULL;
-}
-
-/* Transfer from Mir's data structure to ours */
-static void
-get_mir_session_fd_helper (MirPromptSession * session, size_t count, int const * fdin, void * user_data)
-{
-	auto promise = static_cast<std::promise<int> *>(user_data);
-
-	if (count != 1) {
-		g_warning("Mir trusted session returned %d FDs instead of one", (int)count);
-		promise->set_value(0);
-		return;
-	}
-
-	promise->set_value(fdin[0]);
-}
-
-/* Setup to get the FD from Mir, blocking */
-static int
-get_mir_session_fd (MirPromptSession * session)
-{
-	std::promise<int> promise;
-
-	mir_prompt_session_new_fds_for_prompt_providers(session,
-		1,
-		get_mir_session_fd_helper,
-		&promise);
-
-	return promise.get_future().get();
-}
-
-static GList * open_proxies = NULL;
-
-static gint
-remove_socket_path_find (gconstpointer a, gconstpointer b) 
-{
-	GObject * obj = (GObject *)a;
-	const gchar * path = (const gchar *)b;
-
-	gchar * objpath = (gchar *)g_object_get_qdata(obj, proxy_path_quark());
-	
-	return g_strcmp0(objpath, path);
-}
-
-/* Cleans up if we need to early */
-static gboolean
-remove_socket_path (const gchar * path)
-{
-	GList * thisproxy = g_list_find_custom(open_proxies, path, remove_socket_path_find);
-	if (thisproxy == NULL)
-		return FALSE;
-
-	g_debug("Removing Mir Socket Proxy: %s", path);
-
-	GObject * obj = G_OBJECT(thisproxy->data);
-	open_proxies = g_list_delete_link(open_proxies, thisproxy);
-
-	/* Remove ourselves from DBus if we weren't already */
-	g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(obj));
-
-	/* If we still have FD, close it */
-	int mirfd = GPOINTER_TO_INT(g_object_get_qdata(obj, mir_fd_quark()));
-	if (mirfd != 0) {
-		close(mirfd);
-
-		/* This is actually an error, we should expect not to find
-		   this here to do anything with it. */
-		const gchar * props[3] = {
-			"UbuntuAppLaunchProxyDbusPath",
-			NULL,
-			NULL
-		};
-		props[1] = path;
-		whoopsie_report_recoverable_problem("ubuntu-app-launch-mir-fd-proxy", 0, TRUE, props);
-	}
-
-	g_object_unref(obj);
-
-	return TRUE;
-}
-
-/* Small timeout function that shouldn't, in most cases, ever do anything.
-   But we need it here to ensure we don't leave things on the bus */
-static gboolean
-proxy_timeout (gpointer user_data)
-{
-	const gchar * path = (const gchar *)user_data;
-	remove_socket_path(path);
-	return G_SOURCE_REMOVE;
-}
-
-/* Removes the whole list of proxies if they are there */
-static void
-proxy_cleanup_list (void)
-{
-	while (open_proxies) {
-		GObject * obj = G_OBJECT(open_proxies->data);
-		gchar * path = (gchar *)g_object_get_qdata(obj, proxy_path_quark());
-		remove_socket_path(path);
-	}
-}
-
-static gboolean
-proxy_mir_socket (GObject * obj, GDBusMethodInvocation * invocation, gpointer user_data)
-{
-	g_debug("Called to give Mir socket");
-	int fd = GPOINTER_TO_INT(user_data);
-
-	if (fd == 0) {
-		g_critical("No FDs to give!");
-		return FALSE;
-	}
-
-	/* Index into fds */
-	GVariant* handle = g_variant_new_handle(0);
-	GVariant* tuple = g_variant_new_tuple(&handle, 1);
-
-	GError* error = NULL;
-	GUnixFDList* list = g_unix_fd_list_new();
-	g_unix_fd_list_append(list, fd, &error);
-
-	if (error == NULL) {   
-		g_dbus_method_invocation_return_value_with_unix_fd_list(invocation, tuple, list);
-	} else {
-		g_variant_ref_sink(tuple);
-		g_variant_unref(tuple);
-	}
-
-	g_object_unref(list);
-
-	if (error != NULL) {   
-		g_critical("Unable to pass FD %d: %s", fd, error->message);
-		g_error_free(error);
-		return FALSE;
-	}   
-
-	g_object_set_qdata(obj, mir_fd_quark(), GINT_TO_POINTER(0));
-
-	return TRUE;
-}
-
-/* Sets up the DBus proxy to send to the demangler */
-static gchar *
-build_proxy_socket_path (const gchar * appid, int mirfd)
-{
-	static gboolean final_cleanup = FALSE;
-	if (!final_cleanup) {
-		std::atexit(proxy_cleanup_list);
-		final_cleanup = TRUE;
-	}
-
-	GError * error = NULL;
-	GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
-	if (error != NULL) {
-		g_warning("Unable to get session bus: %s", error->message);
-		g_error_free(error);
-		return NULL;
-	}
-
-	/* Export an Object on DBus */
-	proxySocketDemangler * skel = proxy_socket_demangler_skeleton_new();
-	g_signal_connect(G_OBJECT(skel), "handle-get-mir-socket", G_CALLBACK(proxy_mir_socket), GINT_TO_POINTER(mirfd));
-
-	gchar * encoded_appid = escape_dbus_string(appid);
-	gchar * socket_name = NULL;
-	/* Loop until we fine an object path that isn't taken (probably only once) */
-	while (socket_name == NULL) {
-		gchar* tryname = g_strdup_printf("/com/canonical/UbuntuAppLaunch/%s/%X", encoded_appid, g_random_int());
-		g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(skel),
-			session,
-			tryname,
-			&error);
-
-		if (error == NULL) {
-			socket_name = tryname;
-			g_debug("Exporting Mir socket on path: %s", socket_name);
-		} else {
-			/* Always print the error, but if the object path is in use let's
-			   not exit the loop. Let's just try again. */
-			bool exitnow = (error->domain != G_DBUS_ERROR || error->code != G_DBUS_ERROR_OBJECT_PATH_IN_USE);
-			g_critical("Unable to export trusted session object: %s", error->message);
-
-			g_clear_error(&error);
-			g_free(tryname);
-
-			if (exitnow) {
-				break;
-			}
+	try {
+		auto registry = ubuntu::app_launch::Registry::getDefault();
+		auto appId = ubuntu::app_launch::AppID::parse(appid);
+		auto helper = ubuntu::app_launch::Helper::create(ubuntu::app_launch::Helper::Type::from_raw(type), appId, registry);
+
+		auto uriv = uriVector<ubuntu::app_launch::Helper::URL>(uris);
+		auto inst = helper->launch(uriv);
+
+		if (!inst) {
+			throw std::runtime_error{"Empty instance"};
 		}
-	}
-	g_free(encoded_appid);
-
-	/* If we didn't get a socket name, we should just exit. And
-	   make sure to clean up the socket. */
-	if (socket_name == NULL) {   
-		g_object_unref(skel);
-		g_object_unref(session);
-		g_critical("Unable to export object to any name");
-		return NULL;
-	}
-
-	g_object_set_qdata_full(G_OBJECT(skel), proxy_path_quark(), g_strdup(socket_name), g_free);
-	g_object_set_qdata(G_OBJECT(skel), mir_fd_quark(), GINT_TO_POINTER(mirfd));
-	open_proxies = g_list_prepend(open_proxies, skel);
-
-	g_timeout_add_seconds_full(G_PRIORITY_DEFAULT,
-	                           2,
-	                           proxy_timeout,
-	                           g_strdup(socket_name),
-	                           g_free);
-
-	g_object_unref(session);
-
-	return socket_name;
+
+		return g_strdup(std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::BaseInstance>(inst)->getInstanceId().c_str());
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to launch helper of type '%s' id '%s': %s", type, appid, e.what());
+		return nullptr;
+	}
 }
 
 gchar *
@@ -1154,89 +722,23 @@
 	g_return_val_if_fail(appid != NULL, NULL);
 	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, NULL);
 
-	int mirfd = get_mir_session_fd(session);
-	if (mirfd == 0)
-		return NULL;
-
-	gchar * socket_path = build_proxy_socket_path(appid, mirfd);
-	if (socket_path == NULL) {
-		close(mirfd);
-		return NULL;
-	}
-
-	gchar * instanceid = g_strdup_printf("%" G_GUINT64_FORMAT, g_get_real_time());
-
-	if (start_helper_core(type, appid, uris, instanceid, socket_path)) {
-		return instanceid;
-	}
-
-	remove_socket_path(socket_path);
-	g_free(socket_path);
-	close(mirfd);
-	g_free(instanceid);
-	return NULL;
-}
-
-/* Print an error if we couldn't stop it */
-static void
-stop_helper_callback (GObject * obj, GAsyncResult * res, gpointer user_data)
-{
-	GError * error = NULL;
-	GVariant * result = NULL;
-
-	result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(obj), res, &error);
-	if (result != NULL)
-		g_variant_unref(result);
-
-	if (error != NULL) {
-		g_warning("Unable to stop helper: %s", error->message);
-		g_error_free(error);
-	}
-}
-
-/* Implements the basis of sending the stop message to Upstart for
-   an instance of the untrusted-helper job.  That also can have an
-   instance in that we allow for random instance ids to be used for
-   helpers that are not unique */
-static gboolean
-stop_helper_core (const gchar * type, const gchar * appid, const gchar * instanceid)
-{
-	GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(con != NULL, FALSE);
-
-	const gchar * jobpath = get_jobpath(con, "untrusted-helper");
-
-	/* Build up our environment */
-	GVariantBuilder builder;
-	g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
-	g_variant_builder_open(&builder, G_VARIANT_TYPE_ARRAY);
-	g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("APP_ID=%s", appid)));
-	g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("HELPER_TYPE=%s", type)));
-
-	if (instanceid != NULL) {
-		g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("INSTANCE_ID=%s", instanceid)));
-	}
-
-	g_variant_builder_close(&builder);
-	g_variant_builder_add_value(&builder, g_variant_new_boolean(TRUE));
-	
-	/* Call the job start function */
-	g_dbus_connection_call(con,
-	                       DBUS_SERVICE_UPSTART,
-	                       jobpath,
-	                       DBUS_INTERFACE_UPSTART_JOB,
-	                       "Stop",
-	                       g_variant_builder_end(&builder),
-	                       NULL,
-	                       G_DBUS_CALL_FLAGS_NONE,
-	                       -1,
-	                       NULL, /* cancellable */
-	                       stop_helper_callback,
-	                       NULL);
-
-	g_object_unref(con);
-
-	return TRUE;
+	try {
+		auto registry = ubuntu::app_launch::Registry::getDefault();
+		auto appId = ubuntu::app_launch::AppID::parse(appid);
+		auto helper = ubuntu::app_launch::Helper::create(ubuntu::app_launch::Helper::Type::from_raw(type), appId, registry);
+
+		auto uriv = uriVector<ubuntu::app_launch::Helper::URL>(uris);
+		auto inst = helper->launch(session, uriv);
+
+		if (!inst) {
+			throw std::runtime_error{"Empty instance"};
+		}
+
+		return g_strdup(std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::BaseInstance>(inst)->getInstanceId().c_str());
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to launch helper of type '%s' id '%s': %s", type, appid, e.what());
+		return nullptr;
+	}
 }
 
 gboolean
@@ -1246,7 +748,26 @@
 	g_return_val_if_fail(appid != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, FALSE);
 
-	return stop_helper_core(type, appid, NULL);
+	try {
+		auto registry = ubuntu::app_launch::Registry::getDefault();
+		auto appId = ubuntu::app_launch::AppID::parse(appid);
+		auto helper = ubuntu::app_launch::Helper::create(ubuntu::app_launch::Helper::Type::from_raw(type), appId, registry);
+
+		auto insts = helper->instances();
+		if (insts.empty()) {
+			throw std::runtime_error{"No instances"};
+		}
+		if (insts.size() > 1u) {
+			throw std::runtime_error{"Expecting single instance but has multiple instances"};
+		}
+
+		(*insts.begin())->stop();
+
+		return TRUE;
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to stop helper of type '%s' id '%s': %s", type, appid, e.what());
+		return FALSE;
+	}
 }
 
 gboolean
@@ -1257,45 +778,23 @@
 	g_return_val_if_fail(instanceid != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, FALSE);
 
-	return stop_helper_core(type, appid, instanceid);
-}
-
-
-typedef struct {
-	gchar * type_prefix; /* Type with the colon sperator */
-	size_t type_len;     /* Length in characters of the prefix */
-	GArray * retappids;  /* Array of appids to return */
-} helpers_helper_t;
-
-/* Look at each instance and see if it matches this type, if so
-   add the appid portion to the array of appids */
-static void
-list_helpers_helper (GDBusConnection * con, GVariant * props_dict, gpointer user_data)
-{
-	helpers_helper_t * data = (helpers_helper_t *)user_data;
-
-	GVariant * namev = g_variant_lookup_value(props_dict, "name", G_VARIANT_TYPE_STRING);
-	if (namev == NULL) {
-		return;
-	}
-
-	const gchar * name = g_variant_get_string(namev, NULL);
-	if (g_str_has_prefix(name, data->type_prefix)) {
-		/* Skip the type name */
-		name += data->type_len;
-
-		/* Skip a possible instance ID */
-		name = g_strstr_len(name, -1, ":");
-		name++;
-
-		/* Now copy the app id */
-		gchar * appid = g_strdup(name);
-		g_array_append_val(data->retappids, appid);
-	}
-
-	g_variant_unref(namev);
-
-	return;
+	try {
+		auto registry = ubuntu::app_launch::Registry::getDefault();
+		auto appId = ubuntu::app_launch::AppID::parse(appid);
+		auto helper = ubuntu::app_launch::Helper::create(ubuntu::app_launch::Helper::Type::from_raw(type), appId, registry);
+
+		auto inst = std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::Base>(helper)->existingInstance(instanceid);
+		if (!inst) {
+			throw std::runtime_error{"No instances"};
+		}
+
+		inst->stop();
+
+		return TRUE;
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to stop helper of type '%s' id '%s' instance '%s': %s", type, appid, instanceid, e.what());
+		return FALSE;
+	}
 }
 
 gchar **
@@ -1304,214 +803,99 @@
 	g_return_val_if_fail(type != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, FALSE);
 
-	GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(con != NULL, FALSE);
-
-	helpers_helper_t helpers_helper_data = {
-		g_strdup_printf("%s:", type),
-		strlen(type) + 1, /* 1 for the colon */
-		g_array_new(TRUE, TRUE, sizeof(gchar *))
-	};
-
-	foreach_job_instance(con, "untrusted-helper", list_helpers_helper, &helpers_helper_data);
-
-	g_object_unref(con);
-	g_free(helpers_helper_data.type_prefix);
-
-	return (gchar **)g_array_free(helpers_helper_data.retappids, FALSE);
-}
-
-typedef struct {
-	gchar * type_prefix; /* Type with the colon sperator */
-	size_t type_len;     /* Length in characters of the prefix */
-	GArray * retappids;  /* Array of appids to return */
-	gchar * appid_suffix; /* The appid for the end */
-} helper_instances_t;
-
-/* Look at each instance and see if it matches this type and appid.
-   If so, add the instance ID to the array of instance IDs */
-static void
-list_helper_instances (GDBusConnection * con, GVariant * props_dict, gpointer user_data)
-{
-	helper_instances_t * data = (helper_instances_t *)user_data;
-
-	GVariant * namev = g_variant_lookup_value(props_dict, "name", G_VARIANT_TYPE_STRING);
-	if (namev == NULL) {
-		return;
-	}
-
-	const gchar * name = g_variant_get_string(namev, NULL);
-	gchar * suffix_loc = NULL;
-	if (g_str_has_prefix(name, data->type_prefix) &&
-			(suffix_loc = g_strrstr(name, data->appid_suffix)) != NULL) {
-		/* Skip the type name */
-		name += data->type_len;
-
-		/* Now copy the instance id */
-		gchar * instanceid = g_strndup(name, suffix_loc - name);
-		g_array_append_val(data->retappids, instanceid);
-	}
-
-	g_variant_unref(namev);
-
-	return;
+	try {
+		auto registry = ubuntu::app_launch::Registry::getDefault();
+		auto helpers = registry->runningHelpers(ubuntu::app_launch::Helper::Type::from_raw(type));
+
+		auto array = g_array_new(TRUE, TRUE, sizeof(gchar *));
+
+		for (const auto &helper : helpers) {
+			gchar * appid = g_strdup(std::string(helper->appId()).c_str());
+			g_array_append_val(array, appid);
+		}
+
+		return (gchar **)g_array_free(array, FALSE);
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to get helpers for type '%s': %s", type, e.what());
+		return NULL;
+	}
 }
 
 gchar **
 ubuntu_app_launch_list_helper_instances (const gchar * type, const gchar * appid)
 {
-	g_return_val_if_fail(type != NULL, FALSE);
-	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, FALSE);
-
-	GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(con != NULL, FALSE);
-
-	helper_instances_t helper_instances_data = {
-		g_strdup_printf("%s:", type),
-		strlen(type) + 1, /* 1 for the colon */
-		g_array_new(TRUE, TRUE, sizeof(gchar *)),
-		g_strdup_printf(":%s", appid)
-	};
-
-	foreach_job_instance(con, "untrusted-helper", list_helper_instances, &helper_instances_data);
-
-	g_object_unref(con);
-	g_free(helper_instances_data.type_prefix);
-	g_free(helper_instances_data.appid_suffix);
-
-	return (gchar **)g_array_free(helper_instances_data.retappids, FALSE);
-}
-
-/* The data we keep for each observer */
-typedef struct _helper_observer_t helper_observer_t;
-struct _helper_observer_t {
-	GDBusConnection * conn;
-	guint sighandle;
-	gchar * type;
-	UbuntuAppLaunchHelperObserver func;
-	gpointer user_data;
-};
-
-/* The lists of helper observers */
-static GList * helper_started_obs = NULL;
-static GList * helper_stopped_obs = NULL;
-
-static void
-helper_observer_cb (GDBusConnection * conn, const gchar * sender, const gchar * object, const gchar * interface, const gchar * signal, GVariant * params, gpointer user_data)
-{
-	helper_observer_t * observer = (helper_observer_t *)user_data;
-
-	gchar * env = NULL;
-	GVariant * envs = g_variant_get_child_value(params, 1);
-	GVariantIter iter;
-	g_variant_iter_init(&iter, envs);
-
-	gboolean job_found = FALSE;
-	gchar * instance = NULL;
-
-	while (g_variant_iter_loop(&iter, "s", &env)) {
-		if (g_strcmp0(env, "JOB=untrusted-helper") == 0) {
-			job_found = TRUE;
-		} else if (g_str_has_prefix(env, "INSTANCE=")) {
-			instance = g_strdup(env + strlen("INSTANCE="));
-		}
-	}
-
-	g_variant_unref(envs);
-
-	if (instance != NULL && !g_str_has_prefix(instance, observer->type)) {
-		g_free(instance);
-		instance = NULL;
-	}
-
-	gchar * appid = NULL;
-	gchar * instanceid = NULL;
-	gchar * type = NULL;
-
-	if (instance != NULL) {
-		gchar ** split = g_strsplit(instance, ":", 3);
-		type = split[0];
-		instanceid = split[1];
-		appid = split[2];
-		g_free(split);
-	}
-	g_free(instance);
-
-	if (instanceid != NULL && instanceid[0] == '\0') {
-		g_free(instanceid);
-		instanceid = NULL;
-	}
-
-	if (job_found && appid != NULL) {
-		observer->func(appid, instanceid, type, observer->user_data);
-	}
-
-	g_free(appid);
-	g_free(instanceid);
-	g_free(type);
-}
-
-/* Creates the observer structure and registers for the signal with
-   GDBus so that we can get a callback */
-static gboolean
-add_helper_generic (UbuntuAppLaunchHelperObserver observer, const gchar * helper_type, gpointer user_data, const gchar * signal, GList ** list)
-{
-	GDBusConnection * conn = gdbus_upstart_ref();
-
-	if (conn == NULL) {
-		return FALSE;
-	}
-
-	helper_observer_t * observert = g_new0(helper_observer_t, 1);
-
-	observert->conn = conn;
-	observert->func = observer;
-	observert->user_data = user_data;
-	observert->type = g_strdup_printf("%s:", helper_type);
-
-	*list = g_list_prepend(*list, observert);
-
-	observert->sighandle = g_dbus_connection_signal_subscribe(conn,
-		NULL, /* sender */
-		DBUS_INTERFACE_UPSTART, /* interface */
-		"EventEmitted", /* signal */
-		DBUS_PATH_UPSTART, /* path */
-		signal, /* arg0 */
-		G_DBUS_SIGNAL_FLAGS_NONE,
-		helper_observer_cb,
-		observert,
-		NULL); /* user data destroy */
-
-	return TRUE;
-}
-
-static gboolean
-delete_helper_generic (UbuntuAppLaunchHelperObserver observer, const gchar * type, gpointer user_data, GList ** list)
-{
-	helper_observer_t * observert = NULL;
-	GList * look;
-
-	for (look = *list; look != NULL; look = g_list_next(look)) {
-		observert = (helper_observer_t *)look->data;
-
-		if (observert->func == observer && observert->user_data == user_data && g_str_has_prefix(observert->type, type)) {
-			break;
-		}
-	}
-
-	if (look == NULL) {
-		return FALSE;
-	}
-
-	g_dbus_connection_signal_unsubscribe(observert->conn, observert->sighandle);
-	g_object_unref(observert->conn);
-
-	g_free(observert->type);
-	g_free(observert);
-	*list = g_list_delete_link(*list, look);
-
-	return TRUE;
-}
+	g_return_val_if_fail(type != NULL, NULL);
+	g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, NULL);
+	g_return_val_if_fail(appid != NULL, NULL);
+
+	try {
+		auto registry = ubuntu::app_launch::Registry::getDefault();
+		auto appId = ubuntu::app_launch::AppID::parse(appid);
+		auto helper = ubuntu::app_launch::Helper::create(ubuntu::app_launch::Helper::Type::from_raw(type), appId, registry);
+
+		auto insts = helper->instances();
+
+		auto array = g_array_new(TRUE, TRUE, sizeof(gchar *));
+
+		for (const auto &inst : insts) {
+			auto internalinst = std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::BaseInstance>(inst);
+			auto cstr = g_strdup(internalinst->getInstanceId().c_str());
+			g_array_append_val(array, cstr);
+		}
+
+		return (gchar **)g_array_free(array, FALSE);
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to get helper instances for '%s' of type '%s': %s", appid, type, e.what());
+		return NULL;
+	}
+}
+
+/** A handy helper function that is based of a function to get
+    a signal and put it into a map. */
+template <core::Signal<const std::shared_ptr<ubuntu::app_launch::Helper>&, const std::shared_ptr<ubuntu::app_launch::Helper::Instance>&>& (*getSignal)(ubuntu::app_launch::Helper::Type type, const std::shared_ptr<ubuntu::app_launch::Registry>&)>
+static gboolean
+helper_add (UbuntuAppLaunchHelperObserver observer, const gchar * helper_type, gpointer user_data, std::map<std::tuple<UbuntuAppLaunchHelperObserver, std::string, gpointer>, core::ScopedConnection> &observers)
+{
+	auto context = std::shared_ptr<GMainContext>(g_main_context_ref_thread_default(), [](GMainContext * context) { g_clear_pointer(&context, g_main_context_unref); });
+	auto type = ubuntu::app_launch::Helper::Type::from_raw(helper_type);
+
+	observers.emplace(std::make_pair(
+		std::make_tuple(observer, type.value(), user_data),
+		core::ScopedConnection(
+			getSignal(type, ubuntu::app_launch::Registry::getDefault())
+				.connect([type, context, observer, user_data](std::shared_ptr<ubuntu::app_launch::Helper> app, std::shared_ptr<ubuntu::app_launch::Helper::Instance> instance) {
+					auto internalinst = std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::BaseInstance>(instance);
+
+					std::string appid = app->appId();
+					std::string instanceid = internalinst->getInstanceId();
+
+					executeOnContext(context, [appid, instanceid, type, observer, user_data]() {
+						observer(appid.c_str(), instanceid.c_str(), type.value().c_str(), user_data);
+					});
+			})
+		)
+		));
+
+	return TRUE;
+}
+
+static gboolean
+helper_delete (UbuntuAppLaunchHelperObserver observer, const gchar * helper_type, gpointer user_data, std::map<std::tuple<UbuntuAppLaunchHelperObserver, std::string, gpointer>, core::ScopedConnection> &observers)
+{
+	auto type = ubuntu::app_launch::Helper::Type::from_raw(helper_type);
+	auto iter = observers.find(std::make_tuple(observer, type.value(), user_data));
+
+	if (iter == observers.end()) {
+		return FALSE;
+	}
+
+	observers.erase(iter);
+	return TRUE;
+}
+
+/** Map of all the observers listening for helper started */
+static std::map<std::tuple<UbuntuAppLaunchHelperObserver, std::string, gpointer>, core::ScopedConnection> helperStartedObservers;
+static std::map<std::tuple<UbuntuAppLaunchHelperObserver, std::string, gpointer>, core::ScopedConnection> helperStoppedObservers;
 
 gboolean
 ubuntu_app_launch_observer_add_helper_started (UbuntuAppLaunchHelperObserver observer, const gchar * helper_type, gpointer user_data)
@@ -1520,7 +904,7 @@
 	g_return_val_if_fail(helper_type != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(helper_type, -1, ":") == NULL, FALSE);
 
-	return add_helper_generic(observer, helper_type, user_data, "started", &helper_started_obs);
+return helper_add<&ubuntu::app_launch::Registry::helperStarted>(observer, helper_type, user_data, helperStartedObservers);
 }
 
 gboolean
@@ -1530,7 +914,7 @@
 	g_return_val_if_fail(helper_type != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(helper_type, -1, ":") == NULL, FALSE);
 
-	return add_helper_generic(observer, helper_type, user_data, "stopped", &helper_stopped_obs);
+	return helper_add<&ubuntu::app_launch::Registry::helperStopped>(observer, helper_type, user_data, helperStoppedObservers);
 }
 
 gboolean
@@ -1540,7 +924,7 @@
 	g_return_val_if_fail(helper_type != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(helper_type, -1, ":") == NULL, FALSE);
 
-	return delete_helper_generic(observer, helper_type, user_data, &helper_started_obs);
+	return helper_delete(observer, helper_type, user_data, helperStartedObservers);
 }
 
 gboolean
@@ -1550,39 +934,7 @@
 	g_return_val_if_fail(helper_type != NULL, FALSE);
 	g_return_val_if_fail(g_strstr_len(helper_type, -1, ":") == NULL, FALSE);
 
-	return delete_helper_generic(observer, helper_type, user_data, &helper_stopped_obs);
-}
-
-/* Sets an environment variable in Upstart */
-static void
-set_var (GDBusConnection * bus, const gchar * job_name, const gchar * instance_name, const gchar * envvar)
-{
-	GVariantBuilder builder; /* Target: (assb) */
-	g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
-
-	/* Setup the job properties */
-	g_variant_builder_open(&builder, G_VARIANT_TYPE_ARRAY);
-	g_variant_builder_add_value(&builder, g_variant_new_string(job_name));
-	if (instance_name != NULL)
-		g_variant_builder_add_value(&builder, g_variant_new_string(instance_name));
-	g_variant_builder_close(&builder);
-
-	g_variant_builder_add_value(&builder, g_variant_new_string(envvar));
-
-	/* Do we want to replace?  Yes, we do! */
-	g_variant_builder_add_value(&builder, g_variant_new_boolean(TRUE));
-
-	g_dbus_connection_call(bus,
-		"com.ubuntu.Upstart",
-		"/com/ubuntu/Upstart",
-		"com.ubuntu.Upstart0_6",
-		"SetEnv",
-		g_variant_builder_end(&builder),
-		NULL, /* reply */
-		G_DBUS_CALL_FLAGS_NONE,
-		-1, /* timeout */
-		NULL, /* cancellable */
-		NULL, NULL); /* callback */
+	return helper_delete(observer, helper_type, user_data, helperStoppedObservers);
 }
 
 gboolean
@@ -1591,70 +943,27 @@
 	g_return_val_if_fail(execline != NULL, FALSE);
 	g_return_val_if_fail(execline[0] != '\0', FALSE);
 
-	/* Check to see if we can get the job environment */
-	const gchar * job_name = g_getenv("UPSTART_JOB");
-	const gchar * instance_name = g_getenv("UPSTART_INSTANCE");
-	const gchar * demangler = g_getenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
-	g_return_val_if_fail(job_name != NULL, FALSE);
-
-	GError * error = NULL;
-	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
-
-	if (error != NULL) {
-		g_warning("Unable to get session bus: %s", error->message);
+	GError * error{nullptr};
+	gchar ** splitexec{nullptr};
+	if (!g_shell_parse_argv(execline, nullptr, &splitexec, &error) || error != nullptr) {
+		g_warning("Unable to parse exec line '%s': %s", execline, error->message);
 		g_error_free(error);
 		return FALSE;
 	}
 
-	/* The exec value */
-	gchar * envstr = NULL;
-	if (demangler) {
-		const gchar * demangler_path = g_getenv("UBUNTU_APP_LAUNCH_DEMANGLER");
-		if (demangler_path == nullptr) {
-			demangler_path = DEMANGLER_PATH;
-		}
-		envstr = g_strdup_printf("APP_EXEC=%s %s", demangler_path, execline);
-	} else {
-		envstr = g_strdup_printf("APP_EXEC=%s", execline);
-	}
-
-	set_var(bus, job_name, instance_name, envstr);
-	g_free(envstr);
-
-	/* The directory value */
-	if (directory != NULL) {
-		gchar * direnv = g_strdup_printf("APP_DIR=%s", directory);
-		set_var(bus, job_name, instance_name, direnv);
-		g_free(direnv);
-	}
-
-	g_object_unref(bus);
-
-	return TRUE;
-}
-
-
-/* ensure that all characters are valid in the dbus output string */
-static gchar *
-escape_dbus_string (const gchar * input)
-{
-	static const gchar *xdigits = "0123456789abcdef";
-	GString *escaped;
-	gchar c;
-
-	g_return_val_if_fail (input != NULL, NULL);
-
-	escaped = g_string_new (NULL);
-	while ((c = *input++)) {
-		if (g_ascii_isalnum (c)) {
-			g_string_append_c (escaped, c);
-		} else {
-			g_string_append_c (escaped, '_');
-			g_string_append_c (escaped, xdigits[c >> 4]);
-			g_string_append_c (escaped, xdigits[c & 0xf]);
-		}
-	}
-
-	return g_string_free (escaped, FALSE);
+	std::vector<std::string> execvect;
+	for (auto i = 0; splitexec[i] != nullptr; i++) {
+		execvect.emplace_back(std::string{splitexec[i]});
+	}
+
+	g_strfreev(splitexec);
+
+	try {
+		ubuntu::app_launch::Helper::setExec(execvect);
+		return TRUE;
+	} catch (std::runtime_error &e) {
+		g_warning("Unable to set exec line '%s': %s", execline, e.what());
+		return FALSE;
+	}
 }
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-01-19 18:52:33 +0000
+++ tests/CMakeLists.txt	2017-02-22 21:41:30 +0000
@@ -41,13 +41,12 @@
 add_executable (libual-test
 	libual-test.cc
 	mir-mock.cpp)
-target_link_libraries (libual-test gtest_main ${GTEST_MAIN_LIBRARIES} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} ubuntu-launcher)
+target_link_libraries (libual-test gtest_main ${GTEST_MAIN_LIBRARIES} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} launcher-static)
 
 add_executable (libual-cpp-test
 	libual-cpp-test.cc
-	${CMAKE_SOURCE_DIR}/libubuntu-app-launch/glib-thread.cpp
 	mir-mock.cpp)
-target_link_libraries (libual-cpp-test gtest_main ${GTEST_MAIN_LIBRARIES} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} ubuntu-launcher)
+target_link_libraries (libual-cpp-test gtest_main ${GTEST_MAIN_LIBRARIES} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} launcher-static)
 
 add_executable (data-spew
 	data-spew.c)
@@ -115,45 +114,6 @@
 
 file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-# Failure Test
-
-add_definitions ( -DAPP_FAILED_TOOL="${CMAKE_BINARY_DIR}/application-failed" )
-
-add_executable (failure-test
-	failure-test.cc)
-target_link_libraries (failure-test gtest_main ${GTEST_MAIN_LIBRARIES} ubuntu-launcher)
-add_test (failure-test failure-test)
-
-# ZG Test
-
-add_definitions ( -DZG_EVENT_TOOL="${CMAKE_BINARY_DIR}/zg-report-app" )
-
-add_executable (zg-test
-	zg-test.cc)
-target_link_libraries (zg-test gtest_main ${GTEST_MAIN_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GIO2_LIBRARIES})
-add_test (zg-test zg-test)
-
-# Exec Line Exec Test
-
-configure_file("exec-test.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/exec-test.sh" @ONLY) 
-add_test (exec-test "${CMAKE_CURRENT_BINARY_DIR}/exec-test.sh")
-
-# Exec Utils
-
-add_executable (exec-util-test
-	exec-util-test.cc)
-target_link_libraries (exec-util-test gtest_main ubuntu-launcher ${GTEST_MAIN_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GIO2_LIBRARIES})
-add_test (exec-util-test exec-util-test)
-
-# CGroup Reap Test
-
-add_definitions ( -DCG_REAP_TOOL="${CMAKE_BINARY_DIR}/cgroup-reap-all" )
-
-add_executable (cgroup-reap-test
-	cgroup-reap-test.cc)
-target_link_libraries (cgroup-reap-test gtest_main ${GTEST_MAIN_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GIO2_LIBRARIES})
-add_test (cgroup-reap-test cgroup-reap-test)
-
 # Desktop Hook Test
 
 configure_file ("click-desktop-hook-db/test.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/click-desktop-hook-db/test.conf" @ONLY)
@@ -174,7 +134,6 @@
 
 add_custom_target(format-tests
 	COMMAND clang-format -i -style=file
-	failure-test.cc
 	application-info-desktop.cpp
 	libual-cpp-test.cc
 	list-apps.cpp
@@ -187,4 +146,5 @@
 	spew-master.h
 	systemd-mock.h
 	zg-test.cc
+	zg-mock.h
 )

=== removed file 'tests/cgroup-reap-test.cc'
--- tests/cgroup-reap-test.cc	2017-01-11 23:22:52 +0000
+++ tests/cgroup-reap-test.cc	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Ted Gould <[e-mail]>
- */
-
-#include <gtest/gtest.h>
-#include <gio/gio.h>
-#include <libdbustest/dbus-test.h>
-
-class CGroupReap : public ::testing::Test
-{
-	protected:
-		DbusTestService * service = NULL;
-		DbusTestDbusMock * cgmock = NULL;
-		GDBusConnection * bus = NULL;
-		GPid sleeppid = 0;
-
-		virtual void SetUp() {
-			const gchar * argv[] = { "sleep", "30", NULL };
-			g_spawn_async(NULL,
-			              (gchar **)argv,
-			              NULL, /* env */
-			              G_SPAWN_SEARCH_PATH,
-			              NULL, NULL, /* child setup */
-			              &sleeppid,
-			              NULL); /* error */
-			ASSERT_NE(0, sleeppid);
-
-			service = dbus_test_service_new(NULL);
-
-			/* Create the cgroup manager mock */
-			cgmock = dbus_test_dbus_mock_new("org.test.cgmock");
-			g_setenv("UBUNTU_APP_LAUNCH_CG_MANAGER_NAME", "org.test.cgmock", TRUE);
-
-			DbusTestDbusMockObject * cgobject = dbus_test_dbus_mock_get_object(cgmock, "/org/linuxcontainers/cgmanager", "org.linuxcontainers.cgmanager0_0", NULL);
-			/* This Python code executes in dbusmock and checks to see if the sleeping
-			   process is running. If it is, it returns its PID in the list of PIDs, if
-			   not it doesn't return any PIDs. */
-			gchar * pythoncode = g_strdup_printf(
-				"if os.spawnlp(os.P_WAIT, 'ps', 'ps', '%d') == 0 :\n"
-				"  ret = [ %d ]\n"
-				"else:\n"
-				"  ret = [ ]",
-				sleeppid, sleeppid);
-			dbus_test_dbus_mock_object_add_method(cgmock, cgobject,
-				"GetTasksRecursive",
-				G_VARIANT_TYPE("(ss)"),
-				G_VARIANT_TYPE("ai"),
-				pythoncode,
-				NULL);
-			g_free(pythoncode);
-
-			/* Put it together */
-			dbus_test_service_add_task(service, DBUS_TEST_TASK(cgmock));
-			dbus_test_service_start_tasks(service);
-
-			bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-			g_dbus_connection_set_exit_on_close(bus, FALSE);
-			g_object_add_weak_pointer(G_OBJECT(bus), (gpointer *)&bus);
-
-			/* Make sure we pretend the CG manager is just on our bus */
-			g_setenv("UBUNTU_APP_LAUNCH_CG_MANAGER_SESSION_BUS", "YES", TRUE);
-		}
-
-		virtual void TearDown() {
-			g_clear_object(&cgmock);
-			g_clear_object(&service);
-
-			g_object_unref(bus);
-
-			unsigned int cleartry = 0;
-			while (bus != NULL && cleartry < 100) {
-				pause(100);
-				cleartry++;
-			}
-			ASSERT_EQ(bus, nullptr);
-
-			g_debug("Killing the sleeper: %d", sleeppid);
-			kill(sleeppid, SIGKILL);
-		}
-
-		static gboolean pause_helper (gpointer pmainloop) {
-			g_main_loop_quit(static_cast<GMainLoop *>(pmainloop));
-			return G_SOURCE_REMOVE;
-		}
-
-		void pause (guint time) {
-			if (time > 0) {
-				GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
-				g_timeout_add(time, pause_helper, mainloop);
-
-				g_main_loop_run(mainloop);
-
-				g_main_loop_unref(mainloop);
-			}
-
-			while (g_main_pending()) {
-				g_main_iteration(TRUE);
-			}
-		}
-
-		bool sleepRunning (void) {
-			gint status = 1;
-			gchar * cmdline = g_strdup_printf("ps %d", sleeppid);
-
-			g_spawn_command_line_sync(cmdline, NULL, NULL, &status, NULL);
-			g_free(cmdline);
-
-			return status == 0;
-		}
-};
-
-TEST_F(CGroupReap, KillSleep)
-{
-	g_setenv("UPSTART_JOB", "foo", TRUE);
-	g_setenv("UPSTART_INSTANCE", "bar", TRUE);
-
-	ASSERT_TRUE(g_spawn_command_line_sync(CG_REAP_TOOL, NULL, NULL, NULL, NULL));
-	EXPECT_FALSE(sleepRunning());
-
-	DbusTestDbusMockObject * cgobject = dbus_test_dbus_mock_get_object(cgmock, "/org/linuxcontainers/cgmanager", "org.linuxcontainers.cgmanager0_0", NULL);
-	const DbusTestDbusMockCall * calls = NULL;
-	guint len = 0;
-
-	calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
-	EXPECT_EQ(2u, len);
-	EXPECT_STREQ("GetTasksRecursive", calls->name);
-	EXPECT_TRUE(g_variant_equal(calls->params, g_variant_new("(ss)", "freezer", "")));
-	ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
-}
-

=== removed file 'tests/exec-test-archcolon.sh'
--- tests/exec-test-archcolon.sh	2014-04-30 21:43:28 +0000
+++ tests/exec-test-archcolon.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-if [ "$PATH" != "$APP_DIR:/path" ] ; then
-	echo "Bad PATH: $PATH"
-	exit 1
-fi
-
-if [ "$LD_LIBRARY_PATH" != "$APP_DIR/lib:/lib" ] ; then
-	echo "Bad LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-	exit 1
-fi
-
-if [ "$QML2_IMPORT_PATH" != "/bar/qml/import" ] ; then
-	echo "Bad QML import path: $QML2_IMPORT_PATH"
-	exit 1
-fi
-
-exit 0

=== removed file 'tests/exec-test-colon.sh'
--- tests/exec-test-colon.sh	2014-04-30 21:43:28 +0000
+++ tests/exec-test-colon.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-if [ "$PATH" != "/path" ] ; then
-	echo "Bad PATH: $PATH"
-	exit 1
-fi
-
-if [ "$LD_LIBRARY_PATH" != "/lib" ] ; then
-	echo "Bad LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-	exit 1
-fi
-
-if [ "$QML2_IMPORT_PATH" != "/bar/qml/import" ] ; then
-	echo "Bad QML import path: $QML2_IMPORT_PATH"
-	exit 1
-fi
-
-exit 0

=== removed file 'tests/exec-test-full.sh'
--- tests/exec-test-full.sh	2014-04-30 21:43:28 +0000
+++ tests/exec-test-full.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-if [ "$PATH" != "$APP_DIR/lib/64bit-amazing/bin:$APP_DIR:/path" ] ; then
-	echo "Bad PATH: $PATH"
-	exit 1
-fi
-
-if [ "$LD_LIBRARY_PATH" != "$APP_DIR/lib/64bit-amazing:$APP_DIR/lib:/lib" ] ; then
-	echo "Bad LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-	exit 1
-fi
-
-if [ "$QML2_IMPORT_PATH" != "/bar/qml/import:$APP_DIR/lib/64bit-amazing" ] ; then
-	echo "Bad QML import path: $QML2_IMPORT_PATH"
-	exit 1
-fi
-
-exit 0

=== removed file 'tests/exec-test-noarch.sh'
--- tests/exec-test-noarch.sh	2014-04-30 21:43:28 +0000
+++ tests/exec-test-noarch.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-if [ "$PATH" != "$APP_DIR:/path" ] ; then
-	echo "Bad PATH: $PATH"
-	exit 1
-fi
-
-if [ "$LD_LIBRARY_PATH" != "$APP_DIR/lib:/lib" ] ; then
-	echo "Bad LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-	exit 1
-fi
-
-if [ "$QML2_IMPORT_PATH" != "/bar/qml/import" ] ; then
-	echo "Bad QML import path: $QML2_IMPORT_PATH"
-	exit 1
-fi
-
-exit 0

=== removed file 'tests/exec-test-noinit.sh'
--- tests/exec-test-noinit.sh	2014-04-30 21:43:28 +0000
+++ tests/exec-test-noinit.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash -e