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

[Ted Gould]

Removing support for Click

Removes the Click support but also fixes the tests from helper changes, removing Upstart and finally removing click. The tests should work at the end of this.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:324
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/232/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1704/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1711
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1487/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1487/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1487/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1487/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1487/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1487/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/232/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:326
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/234/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1706/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1713
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1488/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1488/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1488/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1488/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1488/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1488/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/234/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:383
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/259/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1784/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1791
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1567/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1567/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1567/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1567/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1567/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1567/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/259/rebuild

review: Needs Fixing (continuous-integration)

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

384. By Ted Gould on 2017-03-16

Re-enable ABI checking

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:384
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/261/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1799/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1806
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1582/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1582/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1582/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1582/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1582/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1582/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/261/rebuild

review: Needs Fixing (continuous-integration)

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

385. By Ted Gould on 2017-03-18

Drop click docs

386. By Ted Gould on 2017-03-18

A collection of fixes

387. By Ted Gould on 2017-03-18

Remove the click appstore

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:387
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/267/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1829/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1836
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1612/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1612
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1612
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1612
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1612/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1612
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1612/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1612/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/267/rebuild

review: Needs Fixing (continuous-integration)

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

388. By Ted Gould on 2017-03-20

Clean up set_exec tests a bit

389. By Ted Gould on 2017-03-20

Put a full path in to make sure there's nothing funky going on

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:389
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/275/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1844/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1851
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1627/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1627
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1627/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1627
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1627/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1627
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1627/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1627/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1627
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1627/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/275/rebuild

review: Needs Fixing (continuous-integration)

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

390. By Ted Gould on 2017-03-21

Merge through an updated jobs-helpers branch

391. By Ted Gould on 2017-03-21

Change to allApplicationJobs_

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:390
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/278/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1848/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1855
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1631/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1631/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1631/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1631/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1631/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1631/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/278/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:391
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/280/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1850/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1857
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1633
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1633/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1633/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1633
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1633
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1633
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1633/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1633
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1633/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/280/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-21 03:26:39 +0000
+++ CMakeLists.txt	2017-03-21 03:26:40 +0000
@@ -76,9 +76,6 @@
 pkg_check_modules(ZEITGEIST REQUIRED zeitgeist-2.0)
 include_directories(${ZEITGEIST_INCLUDE_DIRS})
 
-pkg_check_modules(CLICK REQUIRED click-0.4>=0.4.18)
-include_directories(${CLICK_INCLUDE_DIRS})
-
 pkg_check_modules(DBUS REQUIRED dbus-1)
 include_directories(${DBUS_INCLUDE_DIRS})
 
@@ -110,36 +107,6 @@
 add_definitions( -DXMIR_HELPER="${pkglibexecdir}/xmir-helper" )
 add_definitions( -DSNAPPY_XMIR="${CMAKE_INSTALL_FULL_BINDIR}/snappy-xmir" )
 
-####################
-# Helpers
-####################
-
-add_library(helpers STATIC helpers.c helpers-shared.c)
-target_link_libraries(helpers ${GIO2_LIBRARIES} ${JSONGLIB_LIBRARIES} ${CLICK_LIBRARIES} ${WHOOPSIE_LIBRARIES})
-
-####################
-# desktop-hook
-####################
-
-add_executable(desktop-hook desktop-hook.c)
-set_target_properties(desktop-hook PROPERTIES OUTPUT_NAME "desktop-hook")
-target_link_libraries(desktop-hook helpers ${CLICK_LIBRARIES} ${WHOOPSIE_LIBRARIES})
-install(TARGETS desktop-hook RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# oom-adjust-setuid-helper
-####################
-
-add_executable(oom-adjust-setuid-helper oom-adjust-setuid-helper.c)
-set_target_properties(oom-adjust-setuid-helper PROPERTIES OUTPUT_NAME "oom-adjust-setuid-helper")
-install(TARGETS oom-adjust-setuid-helper RUNTIME DESTINATION "${pkglibexecdir}")
-
-####################
-# 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(tools)
 add_subdirectory(ubuntu-app-test)

=== modified file 'debian/control'
--- debian/control	2017-03-21 03:26:39 +0000
+++ debian/control	2017-03-21 03:26:40 +0000
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Ted Gould <[e-mail]>
 Build-Depends: abi-compliance-checker,
-               click-dev (>= 0.2.2),
                cmake,
                cmake-extras (>= 0.10),
                dbus-x11,
@@ -11,7 +10,6 @@
                debhelper (>= 9),
                googletest | google-mock,
                libcgmanager-dev,
-               libclick-0.4-dev,
                libcurl4-dev | libcurl4-gnutls-dev,
                libdbus-1-dev,
                libdbustest1-dev (>= 14.04.0),
@@ -42,7 +40,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         click-apparmor,
          dbus-user-session,
          xmir [amd64 armhf i386],
          zeitgeist-core,

=== modified file 'debian/rules'
--- debian/rules	2017-02-15 15:09:13 +0000
+++ debian/rules	2017-03-21 03:26:40 +0000
@@ -12,10 +12,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with click,gir --fail-missing
-
-override_dh_click:
-	dh_click --name ubuntu-app-launch-desktop
+	dh $@ --with gir --fail-missing
 
 override_dh_installdeb:
 	sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \

=== removed file 'desktop-hook.c'
--- desktop-hook.c	2016-04-06 16:19:02 +0000
+++ desktop-hook.c	1970-01-01 00:00:00 +0000
@@ -1,536 +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]>
- */
-
-/*
-
-INTRODUCTION:
-
-This is a hook for Click packages.  You can find information on Click package hooks in
-the click documentation:
-
-https://click.readthedocs.org/en/latest/
-
-Probably the biggest thing to understand for how this code works is that you need to
-understand that this hook is run after one, or many packages are installed.  A set of
-symbolic links are made to the desktop files per-application (not per-package) in the
-directory specified in ubuntu-app-launcher-desktop.click-hook.in.  Those desktop files
-give us the App ID of the packages that are installed and have applications needing
-desktop files in them.  We then operate on each of them ensuring that they are synchronized
-with the desktop files in ~/.local/share/applications/.
-
-The desktop files that we're creating there ARE NOT used for execution by the
-ubuntu-app-launch Upstart jobs.  They are there so that Unity can know which applications
-are installed for this user and they provide an Exec line to allow compatibility with
-desktop environments that are not using ubuntu-app-launch for launching applications.
-You should not modify them and expect any executing under Unity to change.
-
-*/
-
-#include <gio/gio.h>
-#include <glib/gstdio.h>
-#include <click.h>
-#include <string.h>
-#include <errno.h>
-#include <libwhoopsie/recoverable-problem.h>
-
-#include "helpers.h"
-
-typedef struct _app_state_t app_state_t;
-struct _app_state_t {
-	gchar * app_id;
-	gboolean has_click;
-	gboolean has_desktop;
-	guint64 click_modified;
-	guint64 desktop_modified;
-};
-
-/* Desktop Group */
-#define DESKTOP_GROUP      "Desktop Entry"
-/* Desktop Keys */
-#define APP_ID_KEY         "X-Ubuntu-Application-ID"
-#define PATH_KEY           "Path"
-#define EXEC_KEY           "Exec"
-#define ICON_KEY           "Icon"
-#define SYMBOLIC_ICON_KEY  "X-Ubuntu-SymbolicIcon"
-#define SOURCE_FILE_KEY    "X-Ubuntu-UAL-Source-Desktop"
-/* Other */
-#define OLD_KEY_PREFIX     "X-Ubuntu-Old-"
-
-/* Find an entry in the app array */
-app_state_t *
-find_app_entry (const gchar * name, GArray * app_array)
-{
-	int i;
-	for (i = 0; i < app_array->len; i++) {
-		app_state_t * state = &g_array_index(app_array, app_state_t, i);
-
-		if (g_strcmp0(state->app_id, name) == 0) {
-			return state;
-		}
-	}
-
-	app_state_t newstate;
-	newstate.has_click = FALSE;
-	newstate.has_desktop = FALSE;
-	newstate.click_modified = 0;
-	newstate.desktop_modified = 0;
-	newstate.app_id = g_strdup(name);
-
-	g_array_append_val(app_array, newstate);
-
-	/* Note: The pointer needs to be the entry in the array, not the
-	   one that we have on the stack.  Criticaly important. */
-	app_state_t * statepntr = &g_array_index(app_array, app_state_t, app_array->len - 1);
-	return statepntr;
-}
-
-/* Looks up the file creation time, which seems harder with GLib
-   than it should be */
-guint64
-modified_time (const gchar * dir, const gchar * filename)
-{
-	gchar * path = g_build_filename(dir, filename, NULL);
-	GFile * file = g_file_new_for_path(path);
-	GFileInfo * info = g_file_query_info(file, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, NULL);
-
-	guint64 time = g_file_info_get_attribute_uint64(info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-
-	g_object_unref(info);
-	g_object_unref(file);
-	g_free(path);
-
-	return time;
-}
-
-/* Look at an click package entry */
-void
-add_click_package (const gchar * dir, const gchar * name, GArray * app_array)
-{
-	if (!g_str_has_suffix(name, ".desktop")) {
-		return;
-	}
-
-	gchar * appid = g_strdup(name);
-	g_strstr_len(appid, -1, ".desktop")[0] = '\0';
-
-	app_state_t * state = find_app_entry(appid, app_array);
-	state->has_click = TRUE;
-	state->click_modified = modified_time(dir, name);
-
-	g_free(appid);
-
-	return;
-}
-
-/* Look at the desktop file and ensure that it was built by us, and if it
-   was that its source still exists */
-gboolean
-desktop_source_exists (const gchar * dir, const gchar * name)
-{
-	gchar * desktopfile = g_build_filename(dir, name, NULL);
-
-	GKeyFile * keyfile = g_key_file_new();
-	g_key_file_load_from_file(keyfile,
-		desktopfile,
-		G_KEY_FILE_NONE,
-		NULL); /* No error */
-
-	if (!g_key_file_has_key(keyfile, DESKTOP_GROUP, SOURCE_FILE_KEY, NULL)) {
-		gboolean hasappid = g_key_file_has_key(keyfile, DESKTOP_GROUP, APP_ID_KEY, NULL);
-		g_free(desktopfile);
-		g_key_file_free(keyfile);
-		return hasappid;
-	}
-
-	/* At this point we know the key exists, so if we can't find the source
-	   file we want to delete the file as well. We need to replace it. */
-	gchar * originalfile = g_key_file_get_string(keyfile, DESKTOP_GROUP, SOURCE_FILE_KEY, NULL);
-	g_key_file_free(keyfile);
-	gboolean found = TRUE;
-
-	if (!g_file_test(originalfile, G_FILE_TEST_EXISTS)) {
-		g_remove(desktopfile);
-		found = FALSE;
-	}
-
-	g_free(originalfile);
-	g_free(desktopfile);
-
-	return found;
-}
-
-/* Look at an desktop file entry */
-void
-add_desktop_file (const gchar * dir, const gchar * name, GArray * app_array)
-{
-	if (!g_str_has_suffix(name, ".desktop")) {
-		return;
-	}
-
-	if (!desktop_source_exists(dir, name)) {
-		return;
-	}
-
-	gchar * appid = g_strdup(name);
-	g_strstr_len(appid, -1, ".desktop")[0] = '\0';
-
-	/* We only want valid APP IDs as desktop files */
-	if (!app_id_to_triplet(appid, NULL, NULL, NULL)) {
-		g_free(appid);
-		return;
-	}
-
-	app_state_t * state = find_app_entry(appid, app_array);
-	state->has_desktop = TRUE;
-	state->desktop_modified = modified_time(dir, name);
-
-	g_free(appid);
-	return;
-}
-
-/* Open a directory and look at all the entries */
-void
-dir_for_each (const gchar * dirname, void(*func)(const gchar * dir, const gchar * name, GArray * app_array), GArray * app_array)
-{
-	GError * error = NULL;
-	GDir * directory = g_dir_open(dirname, 0, &error);
-
-	if (error != NULL) {
-		g_warning("Unable to read directory '%s': %s", dirname, error->message);
-		g_error_free(error);
-		return;
-	}
-
-	const gchar * filename = NULL;
-	while ((filename = g_dir_read_name(directory)) != NULL) {
-		func(dirname, filename, app_array);
-	}
-
-	g_dir_close(directory);
-	return;
-}
-
-/* Code to report an error, so we can start tracking how important this is */
-static void
-report_recoverable_error (const gchar * app_id, const gchar * iconfield, const gchar * originalicon, const gchar * iconpath)
-{
-	const char * properties[9] = {
-		"IconValue", NULL,
-		"AppID", NULL,
-		"IconPath", NULL,
-		"IconField", NULL,
-		NULL
-	};
-
-	properties[1] = originalicon;
-	properties[3] = app_id;
-	properties[5] = iconpath;
-	properties[7] = iconfield;
-
-	whoopsie_report_recoverable_problem("icon-path-unhandled", 0, TRUE, properties);
-
-	return;
-}
-
-/* Function to take the source Desktop file and build a new
-   one with similar, but not the same data in it */
-static void
-copy_desktop_file (const gchar * from, const gchar * to, const gchar * appdir, const gchar * app_id)
-{
-	GError * error = NULL;
-	GKeyFile * keyfile = g_key_file_new();
-	g_key_file_load_from_file(keyfile,
-		from,
-		G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
-		&error);
-
-	if (error != NULL) {
-		g_warning("Unable to read the desktop file '%s' in the application directory: %s", from, error->message);
-		g_error_free(error);
-		g_key_file_unref(keyfile);
-		return;
-	}
-
-	/* Path Hanlding */
-	if (g_key_file_has_key(keyfile, DESKTOP_GROUP, PATH_KEY, NULL)) {
-		gchar * oldpath = g_key_file_get_string(keyfile, DESKTOP_GROUP, PATH_KEY, NULL);
-		g_debug("Desktop file '%s' has a Path set to '%s'.  Setting as " OLD_KEY_PREFIX PATH_KEY ".", from, oldpath);
-
-		g_key_file_set_string(keyfile, DESKTOP_GROUP, OLD_KEY_PREFIX PATH_KEY, oldpath);
-
-		g_free(oldpath);
-	}
-
-	g_key_file_set_string(keyfile, DESKTOP_GROUP, PATH_KEY, appdir);
-
-	/* Icon Handling */
-	if (g_key_file_has_key(keyfile, DESKTOP_GROUP, ICON_KEY, NULL)) {
-		gchar * originalicon = g_key_file_get_string(keyfile, DESKTOP_GROUP, ICON_KEY, NULL);
-		gchar * iconpath = g_build_filename(appdir, originalicon, NULL);
-
-		/* If the icon in the path exists, let's use that */
-		if (g_file_test(iconpath, G_FILE_TEST_EXISTS)) {
-			g_key_file_set_string(keyfile, DESKTOP_GROUP, ICON_KEY, iconpath);
-			/* Save the old value, because, debugging */
-			g_key_file_set_string(keyfile, DESKTOP_GROUP, OLD_KEY_PREFIX ICON_KEY, originalicon);
-		} else {
-			/* So here we are, realizing all is lost.  Let's file a bug. */
-			/* The goal here is to realize how often this case is, so we know how to prioritize fixing it */
-
-			report_recoverable_error(app_id, ICON_KEY, originalicon, iconpath);
-		}
-
-		g_free(iconpath);
-		g_free(originalicon);
-	}
-
-	/* SymbolicIcon Handling */
-	if (g_key_file_has_key(keyfile, DESKTOP_GROUP, SYMBOLIC_ICON_KEY, NULL)) {
-		gchar * originalicon = g_key_file_get_string(keyfile, DESKTOP_GROUP, SYMBOLIC_ICON_KEY, NULL);
-		gchar * iconpath = g_build_filename(appdir, originalicon, NULL);
-
-		/* If the icon in the path exists, let's use that */
-		if (g_file_test(iconpath, G_FILE_TEST_EXISTS)) {
-			g_key_file_set_string(keyfile, DESKTOP_GROUP, SYMBOLIC_ICON_KEY, iconpath);
-			/* Save the old value, because, debugging */
-			g_key_file_set_string(keyfile, DESKTOP_GROUP, OLD_KEY_PREFIX SYMBOLIC_ICON_KEY, originalicon);
-		} else {
-			/* So here we are, realizing all is lost.  Let's file a bug. */
-			/* The goal here is to realize how often this case is, so we know how to prioritize fixing it */
-
-			report_recoverable_error(app_id, SYMBOLIC_ICON_KEY, originalicon, iconpath);
-		}
-
-		g_free(iconpath);
-		g_free(originalicon);
-	}
-
-	/* Exec Handling */
-	gchar * oldexec = desktop_to_exec(keyfile, from);
-	if (oldexec == NULL) {
-		g_key_file_unref(keyfile);
-		return;
-	}
-
-	gchar * newexec = g_strdup_printf("aa-exec-click -p %s -- %s", app_id, oldexec);
-	g_key_file_set_string(keyfile, DESKTOP_GROUP, EXEC_KEY, newexec);
-	g_free(newexec);
-	g_free(oldexec);
-
-	/* Adding an Application ID */
-	g_key_file_set_string(keyfile, DESKTOP_GROUP, APP_ID_KEY, app_id);
-
-	/* Adding the source file path */
-	g_key_file_set_string(keyfile, DESKTOP_GROUP, SOURCE_FILE_KEY, from);
-
-	/* Output */
-	gsize datalen = 0;
-	gchar * data = g_key_file_to_data(keyfile, &datalen, &error);
-	g_key_file_unref(keyfile);
-
-	if (error != NULL) {
-		g_warning("Unable serialize keyfile built from '%s': %s", from, error->message);
-		g_error_free(error);
-		return;
-	}
-
-	g_file_set_contents(to, data, datalen, &error);
-	g_free(data);
-
-	if (error != NULL) {
-		g_warning("Unable to write out desktop file to '%s': %s", to, error->message);
-		g_error_free(error);
-		return;
-	}
-
-	return;
-}
-
-/* Build a desktop file in the user's home directory */
-static void
-build_desktop_file (app_state_t * state, const gchar * symlinkdir, const gchar * desktopdir)
-{
-	GError * error = NULL;
-	gchar * package = NULL;
-	/* 'Parse' the App ID */
-	if (!app_id_to_triplet(state->app_id, &package, NULL, NULL)) {
-		return;
-	}
-
-	/* Read in the database */
-	ClickDB * db = click_db_new();
-	click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_free(package);
-		g_object_unref(db);
-		return;
-	}
-
-	/* Check click to find out where the files are */
-	ClickUser * user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
-	g_object_unref(db);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_free(package);
-		return;
-	}
-
-	gchar * pkgdir = click_user_get_path(user, package, &error);
-	if (error != NULL) {
-		g_warning("Unable to get the Click package directory for %s: %s", package, error->message);
-		g_error_free(error);
-		g_free(package);
-		return;
-	}
-	g_object_unref(user);
-	g_free(package);
-
-	if (!g_file_test(pkgdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-		g_warning("Directory returned by click '%s' couldn't be found", pkgdir);
-		g_free(pkgdir);
-		return;
-	}
-
-	gchar * indesktop = manifest_to_desktop(pkgdir, state->app_id);
-	if (indesktop == NULL) {
-		g_free(pkgdir);
-		return;
-	}
-
-	/* Determine the desktop file name */
-	gchar * desktopfile = g_strdup_printf("%s.desktop", state->app_id);
-	gchar * desktoppath = g_build_filename(desktopdir, desktopfile, NULL);
-	g_free(desktopfile);
-
-	copy_desktop_file(indesktop, desktoppath, pkgdir, state->app_id);
-
-	g_free(desktoppath);
-	g_free(indesktop);
-	g_free(pkgdir);
-
-	return;
-}
-
-/* Remove the desktop file from the user's home directory */
-static gboolean
-remove_desktop_file (app_state_t * state, const gchar * desktopdir)
-{
-	gchar * desktopfile = g_strdup_printf("%s.desktop", state->app_id);
-	gchar * desktoppath = g_build_filename(desktopdir, desktopfile, NULL);
-	g_free(desktopfile);
-
-	GKeyFile * keyfile = g_key_file_new();
-	g_key_file_load_from_file(keyfile,
-		desktoppath,
-		G_KEY_FILE_NONE,
-		NULL);
-
-	if (!g_key_file_has_key(keyfile, DESKTOP_GROUP, APP_ID_KEY, NULL)) {
-		g_debug("Desktop file '%s' is not one created by us.", desktoppath);
-		g_key_file_unref(keyfile);
-		g_free(desktoppath);
-		return FALSE;
-	}
-	g_key_file_unref(keyfile);
-
-	if (g_unlink(desktoppath) != 0) {
-		g_warning("Unable to delete desktop file: %s", desktoppath);
-	}
-
-	g_free(desktoppath);
-
-	return TRUE;
-}
-
-/* The main function */
-int
-main (int argc, char * argv[])
-{
-	if (argc != 1) {
-		g_error("Shouldn't have arguments");
-		return 1;
-	}
-
-	GArray * apparray = g_array_new(FALSE, FALSE, sizeof(app_state_t));
-
-	/* Find all the symlinks of desktop files */
-	gchar * symlinkdir = g_build_filename(g_get_user_cache_dir(), "ubuntu-app-launch", "desktop", NULL);
-	if (!g_file_test(symlinkdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-		g_debug("No installed click packages");
-	} else {
-		dir_for_each(symlinkdir, add_click_package, apparray);
-	}
-
-	/* Find all the click desktop files */
-	gchar * desktopdir = g_build_filename(g_get_user_data_dir(), "applications", NULL);
-	gboolean desktopdirexists = FALSE;
-	if (!g_file_test(desktopdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-		g_debug("No applications defined");
-	} else {
-		dir_for_each(desktopdir, add_desktop_file, apparray);
-		desktopdirexists = TRUE;
-	}
-
-	/* Process the merge */
-	int i;
-	for (i = 0; i < apparray->len; i++) {
-		app_state_t * state = &g_array_index(apparray, app_state_t, i);
-		g_debug("Processing App ID: %s", state->app_id);
-
-		if (state->has_click && state->has_desktop) {
-			if (state->click_modified > state->desktop_modified) {
-				g_debug("\tClick updated more recently");
-				g_debug("\tRemoving desktop file");
-				if (remove_desktop_file(state, desktopdir)) {
-					g_debug("\tBuilding desktop file");
-					build_desktop_file(state, symlinkdir, desktopdir);
-				}
-			} else {
-				g_debug("\tAlready synchronized");
-			}
-		} else if (state->has_click) {
-			if (!desktopdirexists) {
-				if (g_mkdir_with_parents(desktopdir, 0755) == 0) {
-					g_debug("\tCreated applications directory");
-					desktopdirexists = TRUE;
-				} else {
-					g_warning("\tUnable to create applications directory");
-				}
-			}
-			if (desktopdirexists) {
-				g_debug("\tBuilding desktop file");
-				build_desktop_file(state, symlinkdir, desktopdir);
-			}
-		} else if (state->has_desktop) {
-			g_debug("\tRemoving desktop file");
-			remove_desktop_file(state, desktopdir);
-		}
-
-		g_free(state->app_id);
-	}
-
-	g_array_free(apparray, TRUE);
-	g_free(desktopdir);
-	g_free(symlinkdir);
-
-	return 0;
-}

=== modified file 'docs/index.rst'
--- docs/index.rst	2017-03-21 03:26:39 +0000
+++ docs/index.rst	2017-03-21 03:26:40 +0000
@@ -37,9 +37,6 @@
 UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH
   Path to the libertine launch utility for setting up libertine containers and XMir based legacy apps.
 
-UBUNTU_APP_LAUNCH_LINK_FARM
-  Path to the link farm that is created by Click of all the installed Click applications.
-
 UBUNTU_APP_LAUNCH_OOM_HELPER
   Path to the setuid helper that configures OOM values on application processes that we otherwise couldn't, mostly this is for Oxide.
 
@@ -119,16 +116,6 @@
    :private-members:
    :undoc-members:
 
-Application Implementation Click
---------------------------------
-
-.. doxygenclass:: ubuntu::app_launch::app_impls::Click
-   :project: libubuntu-app-launch
-   :members:
-   :protected-members:
-   :private-members:
-   :undoc-members:
-
 Application Implementation Legacy
 ---------------------------------
 
@@ -199,16 +186,6 @@
    :private-members:
    :undoc-members:
 
-Application Storage Click
--------------------------
-
-.. doxygenclass:: ubuntu::app_launch::app_store::Click
-   :project: libubuntu-app-launch
-   :members:
-   :protected-members:
-   :private-members:
-   :undoc-members:
-
 Application Storage Legacy
 --------------------------
 

=== modified file 'libubuntu-app-launch/CMakeLists.txt'
--- libubuntu-app-launch/CMakeLists.txt	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/CMakeLists.txt	2017-03-21 03:26:40 +0000
@@ -39,8 +39,6 @@
 application.cpp
 app-store-base.h
 app-store-base.cpp
-app-store-click.h
-app-store-click.cpp
 app-store-legacy.h
 app-store-legacy.cpp
 app-store-libertine.h
@@ -54,12 +52,12 @@
 registry-impl.cpp
 application-impl-base.h
 application-impl-base.cpp
-application-impl-click.h
-application-impl-click.cpp
 application-impl-legacy.h
 application-impl-legacy.cpp
 application-impl-libertine.h
 application-impl-libertine.cpp
+application-impl-snap.h
+application-impl-snap.cpp
 application-info-desktop.h
 application-info-desktop.cpp
 application-icon-finder.h
@@ -74,24 +72,17 @@
 jobs-base.cpp
 jobs-systemd.h
 jobs-systemd.cpp
+snapd-info.h
+snapd-info.cpp
 )
 
 set(LAUNCHER_SOURCES
 ubuntu-app-launch.cpp
 second-exec-core.c
 ubuntu-app-launch-trace.c
-app-info.c
-)
-
-if(CURL_FOUND)
-add_definitions ( -DENABLE_SNAPPY=1 )
-list(APPEND LAUNCHER_CPP_SOURCES
-application-impl-snap.h
-application-impl-snap.cpp
-snapd-info.h
-snapd-info.cpp
-)
-endif()
+utils.c
+utils-shared.c
+)
 
 add_custom_target(format
 	COMMAND clang-format -i -style=file ${LAUNCHER_CPP_HEADERS} ${LAUNCHER_CPP_SOURCES}
@@ -117,7 +108,6 @@
 	${LIBERTINE_LIBRARIES}
 	${CURL_LIBRARIES}
 	-lpthread
-	helpers
 	-Wl,--no-undefined
 )
 
@@ -144,7 +134,6 @@
 	${LIBERTINE_LIBRARIES}
 	${CURL_LIBRARIES}
 	-lpthread
-	helpers
 	-Wl,--no-undefined
 )
 

=== removed file 'libubuntu-app-launch/app-info.c'
--- libubuntu-app-launch/app-info.c	2016-08-24 20:29:25 +0000
+++ libubuntu-app-launch/app-info.c	1970-01-01 00:00:00 +0000
@@ -1,277 +0,0 @@
-/*
- * Copyright © 2015 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 <json-glib/json-glib.h>
-#include <click.h>
-
-#include "ubuntu-app-launch.h"
-
-/* Prototypes */
-static gboolean app_info_libertine (const gchar * appid, gchar ** appdir, gchar ** appdesktop);
-
-/* Try and get a manifest and do a couple sanity checks on it */
-static JsonObject *
-get_manifest (const gchar * pkg, gchar ** pkgpath)
-{
-	/* Get the directory from click */
-	GError * error = NULL;
-
-	ClickDB * db = click_db_new();
-	/* If TEST_CLICK_DB is unset, this reads the system database. */
-	click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_object_unref(db);
-		return NULL;
-	}
-	/* If TEST_CLICK_USER is unset, this uses the current user name. */
-	ClickUser * user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		g_error_free(error);
-		g_object_unref(db);
-		return NULL;
-	}
-	g_object_unref(db);
-	JsonObject * manifest = click_user_get_manifest(user, pkg, &error);
-	if (error != NULL) {
-		g_warning("Unable to get manifest for '%s' package: %s", pkg, error->message);
-		g_error_free(error);
-		g_object_unref(user);
-		return NULL;
-	}
-
-	if (pkgpath != NULL) {
-		*pkgpath = click_user_get_path(user, pkg, &error);
-		if (error != NULL) {
-			g_warning("Unable to get the Click package directory for %s: %s", pkg, error->message);
-			g_error_free(error);
-			g_object_unref(user);
-			return NULL;
-		}
-	}
-	g_object_unref(user);
-
-	if (!json_object_has_member(manifest, "version")) {
-		g_warning("Manifest file for package '%s' does not have a version", pkg);
-		json_object_unref(manifest);
-		return NULL;
-	}
-
-	return manifest;
-}
-
-/* Look to see if the app id results in a desktop file, if so, fill in the params */
-static gboolean
-evaluate_dir (const gchar * dir, const gchar * desktop, gchar ** appdir, gchar ** appdesktop)
-{
-	char * fulldir = g_build_filename(dir, "applications", desktop, NULL);
-	gboolean found = FALSE;
-
-	if (g_file_test(fulldir, G_FILE_TEST_EXISTS)) {
-		if (appdir != NULL) {
-			*appdir = g_strdup(dir);
-		}
-
-		if (appdesktop != NULL) {
-			*appdesktop = g_strdup_printf("applications/%s", desktop);
-		}
-
-		found = TRUE;
-	}
-
-	g_free(fulldir);
-	return found;
-}
-
-/* Handle the legacy case where we look through the data directories */
-static gboolean
-app_info_legacy (const gchar * appid, gchar ** appdir, gchar ** appdesktop)
-{
-	gchar * desktop = g_strdup_printf("%s.desktop", appid);
-
-	/* Special case the user's dir */
-	if (evaluate_dir(g_get_user_data_dir(), desktop, appdir, appdesktop)) {
-		g_free(desktop);
-		return TRUE;
-	}
-
-	const char * const * data_dirs = g_get_system_data_dirs();
-	int i;
-	for (i = 0; data_dirs[i] != NULL; i++) {
-		if (evaluate_dir(data_dirs[i], desktop, appdir, appdesktop)) {
-			g_free(desktop);
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-/* Handle the libertine case where we look in the container */
-static gboolean
-app_info_libertine (const gchar * appid, gchar ** appdir, gchar ** appdesktop)
-{
-	char * container = NULL;
-	char * app = NULL;
-
-	if (!ubuntu_app_launch_app_id_parse(appid, &container, &app, NULL)) {
-		return FALSE;
-	}
-
-	gchar * desktopname = g_strdup_printf("%s.desktop", app);
-
-	gchar * desktopdir = g_build_filename(g_get_user_cache_dir(), "libertine-container", container, "rootfs", "usr", "share", NULL);
-	gchar * desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
-
-	if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
-		g_free(desktopdir);
-		g_free(desktopfile);
-
-		desktopdir = g_build_filename(g_get_user_data_dir(), "libertine-container", "user-data", container, ".local", "share", NULL);
-		desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
-
-		if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
-			g_free(desktopdir);
-			g_free(desktopfile);
-
-			g_free(desktopname);
-			g_free(container);
-			g_free(app);
-
-			return FALSE;
-		}
-	}
-
-	if (appdir != NULL) {
-		*appdir = desktopdir;
-	} else {
-		g_free(desktopdir);
-	}
-
-	if (appdesktop != NULL) {
-		*appdesktop = g_build_filename("applications", desktopname, NULL);
-	}
-
-	g_free(desktopfile);
-	g_free(desktopname);
-	g_free(container);
-	g_free(app);
-
-	return TRUE;
-}
-
-/* Get the information on where the desktop file is from libclick */
-static gboolean
-app_info_click (const gchar * appid, gchar ** appdir, gchar ** appdesktop)
-{
-	gchar * package = NULL;
-	gchar * application = NULL;
-
-	if (!ubuntu_app_launch_app_id_parse(appid, &package, &application, NULL)) {
-		return FALSE;
-	}
-
-	JsonObject * manifest = get_manifest(package, appdir);
-	if (manifest == NULL) {
-		g_free(package);
-		g_free(application);
-		return FALSE;
-	}
-
-	g_free(package);
-
-	if (appdesktop != NULL) {
-		JsonObject * hooks = json_object_get_object_member(manifest, "hooks");
-		if (hooks == NULL) {
-			json_object_unref(manifest);
-			g_free(application);
-			return FALSE;
-		}
-
-		JsonObject * appobj = json_object_get_object_member(hooks, application);
-		g_free(application);
-
-		if (appobj == NULL) {
-			json_object_unref(manifest);
-			return FALSE;
-		}
-
-		const gchar * desktop = json_object_get_string_member(appobj, "desktop");
-		if (desktop == NULL) {
-			json_object_unref(manifest);
-			return FALSE;
-		}
-
-		*appdesktop = g_strdup(desktop);
-	} else {
-		g_free(application);
-	}
-
-	json_object_unref(manifest);
-
-	return TRUE;
-}
-
-/* Determine whether it's a click package by looking for the symlink
-   that is created by the desktop hook */
-static gboolean
-is_click (const gchar * appid)
-{
-	gchar * appiddesktop = g_strdup_printf("%s.desktop", appid);
-	gchar * click_link = NULL;
-	const gchar * link_farm_dir = g_getenv("UBUNTU_APP_LAUNCH_LINK_FARM");
-	if (G_LIKELY(link_farm_dir == NULL)) {
-		click_link = g_build_filename(g_get_user_cache_dir(), "ubuntu-app-launch", "desktop", appiddesktop, NULL);
-	} else {
-		click_link = g_build_filename(link_farm_dir, appiddesktop, NULL);
-	}
-	g_free(appiddesktop);
-	gboolean click = g_file_test(click_link, G_FILE_TEST_EXISTS);
-	g_free(click_link);
-
-	return click;
-}
-
-/* Determine whether an AppId is realated to a Libertine container by
-   checking the container and program name. */
-static gboolean
-is_libertine (const gchar * appid)
-{
-	if (app_info_libertine(appid, NULL, NULL)) {
-		g_debug("Libertine application detected: %s", appid);
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-gboolean
-ubuntu_app_launch_application_info (const gchar * appid, gchar ** appdir, gchar ** appdesktop)
-{
-	if (is_click(appid)) {
-		return app_info_click(appid, appdir, appdesktop);
-	} else if (is_libertine(appid)) {
-		return app_info_libertine(appid, appdir, appdesktop);
-	} else {
-		return app_info_legacy(appid, appdir, appdesktop);
-	}
-}
-

=== modified file 'libubuntu-app-launch/app-store-base.cpp'
--- libubuntu-app-launch/app-store-base.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/app-store-base.cpp	2017-03-21 03:26:40 +0000
@@ -18,13 +18,9 @@
  */
 
 #include "app-store-base.h"
-#include "app-store-click.h"
 #include "app-store-legacy.h"
 #include "app-store-libertine.h"
-
-#if ENABLE_SNAPPY
 #include "app-store-snap.h"
-#endif
 
 namespace ubuntu
 {
@@ -44,17 +40,12 @@
 
 std::list<std::shared_ptr<Base>> Base::allAppStores()
 {
-    return
-    {
-        std::make_shared<Click>() /* Click */
-            ,
-            std::make_shared<Legacy>() /* Legacy */
-            ,
-            std::make_shared<Libertine>() /* Libertine */
-#if ENABLE_SNAPPY
-            ,
-            std::make_shared<Snap>() /* Snappy */
-#endif
+    return {
+        std::make_shared<Legacy>() /* Legacy */
+        ,
+        std::make_shared<Libertine>() /* Libertine */
+        ,
+        std::make_shared<Snap>() /* Snappy */
     };
 }
 

=== removed file 'libubuntu-app-launch/app-store-click.cpp'
--- libubuntu-app-launch/app-store-click.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/app-store-click.cpp	1970-01-01 00:00:00 +0000
@@ -1,248 +0,0 @@
-/*
- * 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]>
- */
-
-#include "app-store-click.h"
-#include "application-impl-click.h"
-#include "registry-impl.h"
-
-#include <algorithm>
-
-namespace ubuntu
-{
-namespace app_launch
-{
-namespace app_store
-{
-
-std::list<AppID::AppName> manifestApps(const std::shared_ptr<JsonObject>& manifest);
-AppID::Version manifestVersion(const std::shared_ptr<JsonObject>& manifest);
-
-Click::Click()
-{
-}
-
-Click::~Click()
-{
-}
-
-/** Tries to get the Click manifest for a package. If it can successfully
-    get the manifest returns true.
-
-    \param package Name of the package
-    \param registry Persistent connections to use
-*/
-bool Click::verifyPackage(const AppID::Package& package, const std::shared_ptr<Registry>& registry)
-{
-    return registry->impl->getClickManifest(package) != nullptr;
-}
-
-/** Verifies the applicaiton name by getting the list of applications
-    in the package manifest and seeing if the appname is in the list.
-
-    \param package Name of the package
-    \param appname Name of the application
-    \param registry Persistent connections to use
-*/
-bool Click::verifyAppname(const AppID::Package& package,
-                          const AppID::AppName& appname,
-                          const std::shared_ptr<Registry>& registry)
-{
-    auto manifest = registry->impl->getClickManifest(package);
-    auto apps = manifestApps(manifest);
-
-    return std::find_if(apps.begin(), apps.end(), [&appname](const AppID::AppName& listApp) -> bool {
-               return appname.value() == listApp.value();
-           }) != apps.end();
-}
-
-/** Finds an application name based on a wildcard search. Gets the list
-    from the manifest, and then returns a value from that list.
-
-    \param package Name of the package
-    \param card Wildcard to search as
-    \param registry Persistent connections to use
-*/
-AppID::AppName Click::findAppname(const AppID::Package& package,
-                                  AppID::ApplicationWildcard card,
-                                  const std::shared_ptr<Registry>& registry)
-{
-    auto manifest = registry->impl->getClickManifest(package);
-    auto apps = manifestApps(manifest);
-
-    if (apps.empty())
-    {
-        throw std::runtime_error("No apps in package '" + package.value() + "' to find");
-    }
-
-    switch (card)
-    {
-        case AppID::ApplicationWildcard::FIRST_LISTED:
-            return *apps.begin();
-        case AppID::ApplicationWildcard::LAST_LISTED:
-            return *apps.rbegin();
-        case AppID::ApplicationWildcard::ONLY_LISTED:
-            if (apps.size() != 1)
-            {
-                throw std::runtime_error("More than a single app in package '" + package.value() +
-                                         "' when requested to find only app");
-            }
-            return *apps.begin();
-    }
-
-    throw std::logic_error("Got a value of the app wildcard enum that can't exist");
-}
-
-/** Find the version of a package that that is requested
-
-    \param package Name of the package
-    \param appname Name of the application (not used)
-    \param registry Persistent connections to use
-*/
-AppID::Version Click::findVersion(const AppID::Package& package,
-                                  const AppID::AppName& appname,
-                                  const std::shared_ptr<Registry>& registry)
-{
-    auto manifest = registry->impl->getClickManifest(package);
-    return manifestVersion(manifest);
-}
-
-/** Check to see if this AppID has a desktop file that is in our link
-    farm built by Click. Click puts a symoblic link there for every
-    valid AppID.
-
-    \param appid Application ID to check
-    \param registry Persistent connections to use
-*/
-bool Click::hasAppId(const AppID& appid, const std::shared_ptr<Registry>& registry)
-{
-    std::string appiddesktop = std::string(appid) + ".desktop";
-    gchar* click_link = nullptr;
-    const gchar* link_farm_dir = g_getenv("UBUNTU_APP_LAUNCH_LINK_FARM");
-    if (G_LIKELY(link_farm_dir == nullptr))
-    {
-        click_link =
-            g_build_filename(g_get_user_cache_dir(), "ubuntu-app-launch", "desktop", appiddesktop.c_str(), NULL);
-    }
-    else
-    {
-        click_link = g_build_filename(link_farm_dir, appiddesktop.c_str(), NULL);
-    }
-
-    bool click = g_file_test(click_link, G_FILE_TEST_EXISTS);
-    g_free(click_link);
-
-    return click;
-}
-
-std::list<std::shared_ptr<Application>> Click::list(const std::shared_ptr<Registry>& registry)
-{
-    std::list<std::shared_ptr<Application>> applist;
-
-    try
-    {
-        for (auto pkg : registry->impl->getClickPackages())
-        {
-            try
-            {
-                auto manifest = registry->impl->getClickManifest(pkg);
-
-                for (auto appname : manifestApps(manifest))
-                {
-                    try
-                    {
-                        AppID appid{pkg, appname, manifestVersion(manifest)};
-                        auto app = std::make_shared<app_impls::Click>(appid, manifest, registry);
-                        applist.emplace_back(app);
-                    }
-                    catch (std::runtime_error& e)
-                    {
-                        g_debug("Unable to create Click for application '%s' in package '%s': %s",
-                                appname.value().c_str(), pkg.value().c_str(), e.what());
-                    }
-                }
-            }
-            catch (std::runtime_error& e)
-            {
-                g_debug("Unable to get information to build Click app on package '%s': %s", pkg.value().c_str(),
-                        e.what());
-            }
-        }
-    }
-    catch (std::runtime_error& e)
-    {
-        g_debug("Unable to get packages from Click database: %s", e.what());
-    }
-
-    return applist;
-}
-
-std::shared_ptr<app_impls::Base> Click::create(const AppID& appid, const std::shared_ptr<Registry>& registry)
-{
-    return std::make_shared<app_impls::Click>(appid, registry);
-}
-
-std::list<AppID::AppName> manifestApps(const std::shared_ptr<JsonObject>& manifest)
-{
-    JsonObject* hooks = nullptr;
-    if (!json_object_has_member(manifest.get(), "hooks") ||
-        (hooks = json_object_get_object_member(manifest.get(), "hooks")) == nullptr)
-    {
-        throw std::runtime_error("Manifest does not have a 'hooks' field: " + Registry::Impl::printJson(manifest));
-    }
-
-    auto gapps = json_object_get_members(hooks);
-    if (gapps == nullptr)
-    {
-        throw std::runtime_error("GLib JSON confusion, please talk to your library vendor");
-    }
-
-    std::list<AppID::AppName> apps;
-
-    for (GList* item = gapps; item != nullptr; item = g_list_next(item))
-    {
-        auto appname = (const gchar*)item->data;
-
-        auto hooklist = json_object_get_object_member(hooks, appname);
-
-        if (json_object_has_member(hooklist, "desktop") == TRUE)
-        {
-            apps.emplace_back(AppID::AppName::from_raw(appname));
-        }
-    }
-
-    g_list_free(gapps);
-    return apps;
-}
-
-AppID::Version manifestVersion(const std::shared_ptr<JsonObject>& manifest)
-{
-    const gchar* cstr = nullptr;
-    if (!json_object_has_member(manifest.get(), "version") ||
-        (cstr = json_object_get_string_member(manifest.get(), "version")) == nullptr)
-    {
-        throw std::runtime_error("Unable to find version number in manifest: " + Registry::Impl::printJson(manifest));
-    }
-
-    auto cppstr = AppID::Version::from_raw(cstr);
-    return cppstr;
-}
-
-}  // namespace app_store
-}  // namespace app_launch
-}  // namespace ubuntu

=== removed file 'libubuntu-app-launch/app-store-click.h'
--- libubuntu-app-launch/app-store-click.h	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/app-store-click.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * 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 "app-store-base.h"
-
-namespace ubuntu
-{
-namespace app_launch
-{
-namespace app_store
-{
-
-class Click : public Base
-{
-public:
-    Click();
-    virtual ~Click();
-
-    /* Discover tools */
-    virtual bool verifyPackage(const AppID::Package& package, const std::shared_ptr<Registry>& registry) override;
-    virtual bool verifyAppname(const AppID::Package& package,
-                               const AppID::AppName& appname,
-                               const std::shared_ptr<Registry>& registry) override;
-    virtual AppID::AppName findAppname(const AppID::Package& package,
-                                       AppID::ApplicationWildcard card,
-                                       const std::shared_ptr<Registry>& registry) override;
-    virtual AppID::Version findVersion(const AppID::Package& package,
-                                       const AppID::AppName& appname,
-                                       const std::shared_ptr<Registry>& registry) override;
-    virtual bool hasAppId(const AppID& appid, const std::shared_ptr<Registry>& registry) override;
-
-    /* Possible apps */
-    virtual std::list<std::shared_ptr<Application>> list(const std::shared_ptr<Registry>& registry) override;
-
-    /* Application Creation */
-    virtual std::shared_ptr<app_impls::Base> create(const AppID& appid,
-                                                    const std::shared_ptr<Registry>& registry) override;
-};
-
-}  // namespace app_store
-}  // namespace app_launch
-}  // namespace ubuntu

=== modified file 'libubuntu-app-launch/app-store-snap.cpp'
--- libubuntu-app-launch/app-store-snap.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/app-store-snap.cpp	2017-03-21 03:26:40 +0000
@@ -109,6 +109,12 @@
     }
 
     auto pkgInfo = registry->impl->snapdInfo.pkgInfo(package);
+
+    if (!pkgInfo)
+    {
+        return false;
+    }
+
     return pkgInfo->appnames.find(appname) != pkgInfo->appnames.end();
 }
 
@@ -125,6 +131,11 @@
 {
     auto pkgInfo = registry->impl->snapdInfo.pkgInfo(package);
 
+    if (!pkgInfo)
+    {
+        throw std::runtime_error("Packge '" + package.value() + "' doesn't have valid info.");
+    }
+
     if (pkgInfo->appnames.empty())
     {
         throw std::runtime_error("No apps in package '" + package.value() + "' to find");
@@ -159,7 +170,14 @@
                                  const std::shared_ptr<Registry>& registry)
 {
     auto pkgInfo = registry->impl->snapdInfo.pkgInfo(package);
-    return AppID::Version::from_raw(pkgInfo->revision);
+    if (pkgInfo)
+    {
+        return AppID::Version::from_raw(pkgInfo->revision);
+    }
+    else
+    {
+        return AppID::Version::from_raw({});
+    }
 }
 
 /** Operator to compare apps for our sets */

=== modified file 'libubuntu-app-launch/application-impl-base.cpp'
--- libubuntu-app-launch/application-impl-base.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/application-impl-base.cpp	2017-03-21 03:26:40 +0000
@@ -24,9 +24,9 @@
 #include <numeric>
 
 #include "application-impl-base.h"
-#include "helpers.h"
 #include "registry-impl.h"
 #include "second-exec-core.h"
+#include "utils.h"
 
 extern "C" {
 #include "ubuntu-app-launch-trace.h"

=== removed file 'libubuntu-app-launch/application-impl-click.cpp'
--- libubuntu-app-launch/application-impl-click.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/application-impl-click.cpp	1970-01-01 00:00:00 +0000
@@ -1,189 +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 "application-impl-click.h"
-#include "application-info-desktop.h"
-#include "registry-impl.h"
-
-#include <algorithm>
-
-namespace ubuntu
-{
-namespace app_launch
-{
-namespace app_impls
-{
-
-std::pair<std::shared_ptr<GKeyFile>, std::string> manifestAppDesktop(const std::shared_ptr<JsonObject>& manifest,
-                                                                     const std::string& package,
-                                                                     const std::string& app,
-                                                                     const std::string& clickDir);
-
-Click::Click(const AppID& appid, const std::shared_ptr<Registry>& registry)
-    : Click(appid, registry->impl->getClickManifest(appid.package), registry)
-{
-}
-
-Click::Click(const AppID& appid, const std::shared_ptr<JsonObject>& manifest, const std::shared_ptr<Registry>& registry)
-    : Base(registry)
-    , _appid(appid)
-    , _manifest(manifest)
-    , _clickDir(registry->impl->getClickDir(appid.package))
-{
-    std::tie(_keyfile, desktopPath_) = manifestAppDesktop(_manifest, appid.package, appid.appname, _clickDir);
-    if (!_keyfile)
-        throw std::runtime_error{"No keyfile found for click application: " + std::string(appid)};
-
-    g_debug("Application Click object for appid '%s'", std::string(appid).c_str());
-}
-
-AppID Click::appId()
-{
-    return _appid;
-}
-
-std::shared_ptr<Application::Info> Click::info()
-{
-    if (!_info)
-    {
-        _info = std::make_shared<app_info::Desktop>(appId(), _keyfile, _clickDir, _clickDir,
-                                                    app_info::DesktopFlags::NONE, nullptr);
-    }
-
-    return _info;
-}
-
-AppID::Version manifestVersion(const std::shared_ptr<JsonObject>& manifest)
-{
-    const gchar* cstr = nullptr;
-    if (!json_object_has_member(manifest.get(), "version") ||
-        (cstr = json_object_get_string_member(manifest.get(), "version")) == nullptr)
-    {
-        throw std::runtime_error("Unable to find version number in manifest: " + Registry::Impl::printJson(manifest));
-    }
-
-    auto cppstr = AppID::Version::from_raw(cstr);
-    return cppstr;
-}
-
-std::pair<std::shared_ptr<GKeyFile>, std::string> manifestAppDesktop(const std::shared_ptr<JsonObject>& manifest,
-                                                                     const std::string& package,
-                                                                     const std::string& app,
-                                                                     const std::string& clickDir)
-{
-    if (!manifest)
-    {
-        throw std::runtime_error("No manifest for package '" + package + "'");
-    }
-
-    JsonObject* hooks = nullptr;
-    if (!json_object_has_member(manifest.get(), "hooks") ||
-        (hooks = json_object_get_object_member(manifest.get(), "hooks")) == nullptr)
-    {
-        throw std::runtime_error("Manifest for application '" + app +
-                                 "' does not have a 'hooks' field: " + Registry::Impl::printJson(manifest));
-    }
-
-    auto gapps = json_object_get_members(hooks);
-    if (gapps == nullptr)
-    {
-        throw std::runtime_error("GLib JSON confusion, please talk to your library vendor");
-    }
-    else
-    {
-        g_list_free(gapps);
-    }
-
-    JsonObject* hooklist = nullptr;
-    if (!json_object_has_member(hooks, app.c_str()) ||
-        (hooklist = json_object_get_object_member(hooks, app.c_str())) == nullptr)
-    {
-        throw std::runtime_error("Manifest for does not have an application '" + app +
-                                 "': " + Registry::Impl::printJson(manifest));
-    }
-
-    auto desktoppath = json_object_get_string_member(hooklist, "desktop");
-    if (desktoppath == nullptr)
-        throw std::runtime_error("Manifest for application '" + app +
-                                 "' does not have a 'desktop' hook: " + Registry::Impl::printJson(manifest));
-
-    auto path = std::shared_ptr<gchar>(g_build_filename(clickDir.c_str(), desktoppath, nullptr), g_free);
-
-    std::shared_ptr<GKeyFile> keyfile(g_key_file_new(), g_key_file_free);
-    GError* error = nullptr;
-    g_key_file_load_from_file(keyfile.get(), path.get(), G_KEY_FILE_NONE, &error);
-    if (error != nullptr)
-    {
-        auto perror = std::shared_ptr<GError>(error, g_error_free);
-        throw std::runtime_error(perror.get()->message);
-    }
-
-    return std::make_pair(keyfile, std::string(path.get()));
-}
-
-std::vector<std::shared_ptr<Application::Instance>> Click::instances()
-{
-    auto vbase = _registry->impl->jobs->instances(appId(), "application-click");
-    return std::vector<std::shared_ptr<Application::Instance>>(vbase.begin(), vbase.end());
-}
-
-/** Grabs all the environment variables for the application to
-    launch in. It sets up the confinement ones and then adds in
-    the APP_EXEC line and whether to use XMir */
-std::list<std::pair<std::string, std::string>> Click::launchEnv()
-{
-    auto retval = confinedEnv(_appid.package, _clickDir);
-
-    retval.emplace_back(std::make_pair("APP_DIR", _clickDir));
-    retval.emplace_back(std::make_pair("APP_DESKTOP_FILE_PATH", desktopPath_));
-
-    retval.emplace_back(std::make_pair("QML2_IMPORT_PATH", _clickDir + "/lib/" + UBUNTU_APP_LAUNCH_ARCH + "/qml"));
-
-    info();
-
-    retval.emplace_back(std::make_pair("APP_XMIR_ENABLE", _info->xMirEnable().value() ? "1" : "0"));
-    retval.emplace_back(std::make_pair("APP_EXEC", _info->execLine().value()));
-
-    retval.emplace_back(std::make_pair("APP_EXEC_POLICY", std::string(appId())));
-
-    return retval;
-}
-
-std::shared_ptr<Application::Instance> Click::launch(const std::vector<Application::URL>& urls)
-{
-    std::function<std::list<std::pair<std::string, std::string>>(void)> envfunc = [this]() { return launchEnv(); };
-    return _registry->impl->jobs->launch(appId(), "application-click", {}, urls, jobs::manager::launchMode::STANDARD,
-                                         envfunc);
-}
-
-std::shared_ptr<Application::Instance> Click::launchTest(const std::vector<Application::URL>& urls)
-{
-    std::function<std::list<std::pair<std::string, std::string>>(void)> envfunc = [this]() { return launchEnv(); };
-    return _registry->impl->jobs->launch(appId(), "application-click", {}, urls, jobs::manager::launchMode::TEST,
-                                         envfunc);
-}
-
-std::shared_ptr<Application::Instance> Click::findInstance(const std::string& instanceid)
-{
-    return _registry->impl->jobs->existing(appId(), "application-click", instanceid, std::vector<Application::URL>{});
-}
-
-}  // namespace app_impls
-}  // namespace app_launch
-}  // namespace ubuntu

=== removed file 'libubuntu-app-launch/application-impl-click.h'
--- libubuntu-app-launch/application-impl-click.h	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/application-impl-click.h	1970-01-01 00:00:00 +0000
@@ -1,82 +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 "application-impl-base.h"
-#include "application-info-desktop.h"
-
-#include <gio/gdesktopappinfo.h>
-#include <json-glib/json-glib.h>
-
-#pragma once
-
-namespace ubuntu
-{
-namespace app_launch
-{
-namespace app_impls
-{
-
-/** Application Implmentation for Click packages. Click packages
-    are installed via the click tool and have information avaialable
-    on them via libclick. There is one version per-user on the system
-    and a Ubuntu App Launch hook makes a link to each of those versions
-    in the user's cache directory. Click ensures this is up-to-date.
-
-    Application IDs for Click packages are the standard it was built on.
-    Typically a package name is "$(application).$(developer id)" though
-    there isn't a requirement in the local Click tools to require that. The
-    appname element is gotten from the JSON manifest in the Click package and
-    should reference a desktop file. All Click packages also have a version.
-
-    More info: http://click.readthedocs.io/
-*/
-class Click : public Base
-{
-public:
-    Click(const AppID& appid, const std::shared_ptr<Registry>& registry);
-    Click(const AppID& appid, const std::shared_ptr<JsonObject>& manifest, const std::shared_ptr<Registry>& registry);
-
-    AppID appId() override;
-
-    std::shared_ptr<Info> info() override;
-
-    std::vector<std::shared_ptr<Instance>> instances() override;
-
-    std::shared_ptr<Instance> launch(const std::vector<Application::URL>& urls = {}) override;
-    std::shared_ptr<Instance> launchTest(const std::vector<Application::URL>& urls = {}) override;
-
-    virtual std::shared_ptr<Application::Instance> findInstance(const std::string& instanceid) override;
-
-private:
-    AppID _appid;
-
-    std::shared_ptr<JsonObject> _manifest;
-
-    std::string _clickDir;
-    std::shared_ptr<GKeyFile> _keyfile;
-    std::string desktopPath_;
-
-    std::shared_ptr<app_info::Desktop> _info;
-
-    std::list<std::pair<std::string, std::string>> launchEnv();
-};
-
-}  // namespace app_impls
-}  // namespace app_launch
-}  // namespace ubuntu

=== modified file 'libubuntu-app-launch/glib-thread.cpp'
--- libubuntu-app-launch/glib-thread.cpp	2016-08-12 23:13:00 +0000
+++ libubuntu-app-launch/glib-thread.cpp	2017-03-21 03:26:40 +0000
@@ -119,7 +119,7 @@
     return _cancel;
 }
 
-void ContextThread::simpleSource(std::function<GSource*()> srcBuilder, std::function<void()> work)
+guint ContextThread::simpleSource(std::function<GSource*()> srcBuilder, std::function<void()> work)
 {
     if (isCancelled())
     {
@@ -144,22 +144,33 @@
                               delete heapWork;
                           });
 
-    g_source_attach(source.get(), _context.get());
-}
-
-void ContextThread::executeOnThread(std::function<void()> work)
-{
-    simpleSource(g_idle_source_new, work);
-}
-
-void ContextThread::timeout(const std::chrono::milliseconds& length, std::function<void()> work)
-{
-    simpleSource([length]() { return g_timeout_source_new(length.count()); }, work);
-}
-
-void ContextThread::timeoutSeconds(const std::chrono::seconds& length, std::function<void()> work)
-{
-    simpleSource([length]() { return g_timeout_source_new_seconds(length.count()); }, work);
+    return g_source_attach(source.get(), _context.get());
+}
+
+guint ContextThread::executeOnThread(std::function<void()> work)
+{
+    return simpleSource(g_idle_source_new, work);
+}
+
+guint ContextThread::timeout(const std::chrono::milliseconds& length, std::function<void()> work)
+{
+    return simpleSource([length]() { return g_timeout_source_new(length.count()); }, work);
+}
+
+guint ContextThread::timeoutSeconds(const std::chrono::seconds& length, std::function<void()> work)
+{
+    return simpleSource([length]() { return g_timeout_source_new_seconds(length.count()); }, work);
+}
+
+void ContextThread::removeSource(guint sourceid)
+{
+    auto source = g_main_context_find_source_by_id(_context.get(), sourceid);
+    if (source == nullptr)
+    {
+        return;
+    }
+
+    g_source_destroy(source);
 }
 
 }  // ns GLib

=== modified file 'libubuntu-app-launch/glib-thread.h'
--- libubuntu-app-launch/glib-thread.h	2016-08-24 02:53:12 +0000
+++ libubuntu-app-launch/glib-thread.h	2017-03-21 03:26:40 +0000
@@ -46,7 +46,7 @@
     bool isCancelled();
     std::shared_ptr<GCancellable> getCancellable();
 
-    void executeOnThread(std::function<void()> work);
+    guint executeOnThread(std::function<void()> work);
     template <typename T>
     auto executeOnThread(std::function<T()> work) -> T
     {
@@ -75,21 +75,23 @@
         return future.get();
     }
 
-    void timeout(const std::chrono::milliseconds& length, std::function<void()> work);
+    guint timeout(const std::chrono::milliseconds& length, std::function<void()> work);
     template <class Rep, class Period>
-    void timeout(const std::chrono::duration<Rep, Period>& length, std::function<void()> work)
+    guint timeout(const std::chrono::duration<Rep, Period>& length, std::function<void()> work)
     {
         return timeout(std::chrono::duration_cast<std::chrono::milliseconds>(length), work);
     }
 
-    void timeoutSeconds(const std::chrono::seconds& length, std::function<void()> work);
+    guint timeoutSeconds(const std::chrono::seconds& length, std::function<void()> work);
     template <class Rep, class Period>
-    void timeoutSeconds(const std::chrono::duration<Rep, Period>& length, std::function<void()> work)
+    guint timeoutSeconds(const std::chrono::duration<Rep, Period>& length, std::function<void()> work)
     {
         return timeoutSeconds(std::chrono::duration_cast<std::chrono::seconds>(length), work);
     }
 
+    void removeSource(guint sourceid);
+
 private:
-    void simpleSource(std::function<GSource*()> srcBuilder, std::function<void()> work);
+    guint simpleSource(std::function<GSource*()> srcBuilder, std::function<void()> work);
 };
 }

=== modified file 'libubuntu-app-launch/helper.cpp'
--- libubuntu-app-launch/helper.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/helper.cpp	2017-03-21 03:26:40 +0000
@@ -86,7 +86,7 @@
 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::vector<std::shared_ptr<Helper::Instance>> wrapped{insts.size()};
 
     std::transform(insts.begin(), insts.end(), wrapped.begin(),
                    [](std::shared_ptr<jobs::instance::Base>& inst) { return std::make_shared<BaseInstance>(inst); });
@@ -110,8 +110,12 @@
 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()); });
+
+    for (const auto& hurl : in)
+    {
+        out.push_back(Application::URL::from_raw(hurl.value()));
+    }
+
     return out;
 }
 
@@ -191,6 +195,8 @@
                                                        return accum.empty() ? addon : accum + " " + addon;
                                                    })));
 
+    envs.emplace_back(std::make_pair("HELPER_TYPE", _type.value()));
+
     return envs;
 }
 
@@ -206,14 +212,17 @@
 class MirFDProxy
 {
 public:
+    std::shared_ptr<Registry> reg_;
     int mirfd;
     std::shared_ptr<proxySocketDemangler> skel;
     guint handle;
     std::string path;
     std::string name;
+    guint timeout{0};
 
     MirFDProxy(MirPromptSession* session, const AppID& appid, const std::shared_ptr<Registry>& reg)
-        : name(g_dbus_connection_get_unique_name(reg->impl->_dbus.get()))
+        : reg_(reg)
+        , name(g_dbus_connection_get_unique_name(reg->impl->_dbus.get()))
     {
         if (appid.empty())
         {
@@ -291,6 +300,7 @@
 
     ~MirFDProxy()
     {
+        g_debug("Mir Prompt Proxy shutdown");
         if (mirfd != 0)
         {
             close(mirfd);
@@ -304,6 +314,11 @@
         g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(skel.get()));
     }
 
+    void setTimeout(guint timeoutin)
+    {
+        timeout = timeoutin;
+    }
+
     static std::string dbusSafe(const std::string& in)
     {
         std::string out = in;
@@ -347,6 +362,13 @@
         }
 
         mirfd = 0;
+
+        /* Remove the timeout on the mainloop */
+        auto reg = reg_;
+        auto timeoutlocal = timeout;
+
+        reg->impl->thread.executeOnThread([reg, timeoutlocal]() { reg->impl->thread.removeSource(timeoutlocal); });
+
         return true;
     }
 
@@ -391,7 +413,8 @@
 
     /* 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"); });
+    proxy->setTimeout(
+        _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));

=== modified file 'libubuntu-app-launch/jobs-base.cpp'
--- libubuntu-app-launch/jobs-base.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/jobs-base.cpp	2017-03-21 03:26:40 +0000
@@ -39,7 +39,7 @@
 
 Base::Base(const std::shared_ptr<Registry>& registry)
     : registry_(registry)
-    , allApplicationJobs_{"application-click", "application-legacy", "application-snap"}
+    , allApplicationJobs_{"application-legacy", "application-snap"}
     , dbus_(registry->impl->_dbus)
 {
 }
@@ -84,13 +84,20 @@
                 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);
+            try
+            {
+                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);
+            }
+            catch (std::runtime_error& e)
+            {
+                g_warning("Error in appStarted signal from job: %s", e.what());
+            }
         });
     });
 
@@ -107,13 +114,20 @@
                 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);
+            try
+            {
+                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);
+            }
+            catch (std::runtime_error& e)
+            {
+                g_warning("Error in appStopped signal from job: %s", e.what());
+            }
         });
     });
 
@@ -132,13 +146,20 @@
                 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);
+            try
+            {
+                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);
+            }
+            catch (std::runtime_error& e)
+            {
+                g_warning("Error in appFailed signal from job: %s", e.what());
+            }
         });
     });
 
@@ -487,16 +508,23 @@
                 return;
             }
 
-            auto vparams = std::shared_ptr<GVariant>(g_variant_ref(params), g_variant_unref);
-            auto conn = std::shared_ptr<GDBusConnection>(reinterpret_cast<GDBusConnection*>(g_object_ref(cconn)),
-                                                         [](GDBusConnection* con) { g_clear_object(&con); });
-            std::string sender = csender;
-            std::shared_ptr<Application> app;
-            std::shared_ptr<Application::Instance> instance;
-
-            std::tie(app, instance) = managerParams(vparams, reg);
-
-            data->func(reg, app, instance, conn, sender, vparams);
+            try
+            {
+                auto vparams = std::shared_ptr<GVariant>(g_variant_ref(params), g_variant_unref);
+                auto conn = std::shared_ptr<GDBusConnection>(reinterpret_cast<GDBusConnection*>(g_object_ref(cconn)),
+                                                             [](GDBusConnection* con) { g_clear_object(&con); });
+                std::string sender = csender;
+                std::shared_ptr<Application> app;
+                std::shared_ptr<Application::Instance> instance;
+
+                std::tie(app, instance) = managerParams(vparams, reg);
+
+                data->func(reg, app, instance, conn, sender, vparams);
+            }
+            catch (std::runtime_error& e)
+            {
+                g_warning("Unable to call signal handler for manager signal: %s", e.what());
+            }
         },
         focusdata,
         [](gpointer user_data) {
@@ -632,7 +660,14 @@
             continue;
         }
 
-        apps.emplace_back(Application::create(id, registry));
+        try
+        {
+            apps.emplace_back(Application::create(id, registry));
+        }
+        catch (std::runtime_error& e)
+        {
+            g_debug("Error adding appid '%s' to running apps list: %s", appid.c_str(), e.what());
+        }
     }
 
     return apps;

=== modified file 'libubuntu-app-launch/jobs-systemd.cpp'
--- libubuntu-app-launch/jobs-systemd.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/jobs-systemd.cpp	2017-03-21 03:26:40 +0000
@@ -19,9 +19,9 @@
 
 #include "jobs-systemd.h"
 #include "application-impl-base.h"
-#include "helpers.h"
 #include "registry-impl.h"
 #include "second-exec-core.h"
+#include "utils.h"
 
 extern "C" {
 #include "ubuntu-app-launch-trace.h"
@@ -587,6 +587,9 @@
     if (appId.empty())
         return {};
 
+    bool isApplication =
+        std::find(allApplicationJobs_.begin(), allApplicationJobs_.end(), job) != allApplicationJobs_.end();
+
     auto registry = registry_.lock();
     return registry->impl->thread.executeOnThread<std::shared_ptr<instance::SystemD>>(
         [&]() -> std::shared_ptr<instance::SystemD> {
@@ -602,10 +605,15 @@
                 timeout = 0;
             }
 
-            auto handshake = starting_handshake_start(appIdStr.c_str(), instance.c_str(), timeout);
-            if (handshake == nullptr)
+            handshake_t* handshake{nullptr};
+
+            if (isApplication)
             {
-                g_warning("Unable to setup starting handshake");
+                handshake = starting_handshake_start(appIdStr.c_str(), instance.c_str(), timeout);
+                if (handshake == nullptr)
+                {
+                    g_warning("Unable to setup starting handshake");
+                }
             }
 
             /* Figure out the unit name for the job */
@@ -903,8 +911,7 @@
 }
 
 /* TODO: Application job names */
-const std::regex unitNaming{
-    "^ubuntu\\-app\\-launch\\-(application\\-(?:click|legacy|snap))\\-(.*)\\-([0-9]*)\\.service$"};
+const std::regex unitNaming{"^ubuntu\\-app\\-launch\\-\\-(.*)\\-\\-(.*)\\-\\-([0-9]*)\\.service$"};
 
 SystemD::UnitInfo SystemD::parseUnit(const std::string& unit) const
 {
@@ -919,7 +926,7 @@
 
 std::string SystemD::unitName(const SystemD::UnitInfo& info) const
 {
-    return std::string{"ubuntu-app-launch-"} + info.job + "-" + info.appid + "-" + info.inst + ".service";
+    return std::string{"ubuntu-app-launch--"} + info.job + "--" + info.appid + "--" + info.inst + ".service";
 }
 
 std::string SystemD::unitPath(const SystemD::UnitInfo& info)
@@ -1347,6 +1354,11 @@
     auto cancel = registry->impl->thread.getCancellable();
 
     registry->impl->thread.executeOnThread([bus, unitname, cancel] {
+        if (g_cancellable_is_cancelled(cancel.get()))
+        {
+            return;
+        }
+
         g_dbus_connection_call(bus.get(),                       /* user bus */
                                SYSTEMD_DBUS_ADDRESS,            /* bus name */
                                SYSTEMD_DBUS_PATH_MANAGER,       /* path */

=== modified file 'libubuntu-app-launch/registry-impl.cpp'
--- libubuntu-app-launch/registry-impl.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/registry-impl.cpp	2017-03-21 03:26:40 +0000
@@ -28,11 +28,13 @@
 {
 
 Registry::Impl::Impl(Registry* registry)
+    : Impl(registry, app_store::Base::allAppStores())
+{
+}
+
+Registry::Impl::Impl(Registry* registry, std::list<std::shared_ptr<app_store::Base>> appStores)
     : thread([]() {},
              [this]() {
-                 _clickUser.reset();
-                 _clickDB.reset();
-
                  zgLog_.reset();
                  jobs.reset();
 
@@ -42,7 +44,7 @@
              })
     , _registry{registry}
     , _iconFinders()
-    , _appStores(app_store::Base::allAppStores())
+    , _appStores(appStores)
 {
     auto cancel = thread.getCancellable();
     _dbus = thread.executeOnThread<std::shared_ptr<GDBusConnection>>([cancel]() {
@@ -62,52 +64,6 @@
     }
 }
 
-void Registry::Impl::initClick()
-{
-    if (_clickDB && _clickUser)
-    {
-        return;
-    }
-
-    auto init = thread.executeOnThread<bool>([this]() {
-        GError* error = nullptr;
-
-        if (!_clickDB)
-        {
-            _clickDB = std::shared_ptr<ClickDB>(click_db_new(), [](ClickDB* db) { g_clear_object(&db); });
-            /* If TEST_CLICK_DB is unset, this reads the system database. */
-            click_db_read(_clickDB.get(), g_getenv("TEST_CLICK_DB"), &error);
-
-            if (error != nullptr)
-            {
-                auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
-                throw std::runtime_error(perror->message);
-            }
-        }
-
-        if (!_clickUser)
-        {
-            _clickUser =
-                std::shared_ptr<ClickUser>(click_user_new_for_user(_clickDB.get(), g_getenv("TEST_CLICK_USER"), &error),
-                                           [](ClickUser* user) { g_clear_object(&user); });
-
-            if (error != nullptr)
-            {
-                auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
-                throw std::runtime_error(perror->message);
-            }
-        }
-
-        g_debug("Initialized Click DB");
-        return true;
-    });
-
-    if (!init)
-    {
-        throw std::runtime_error("Unable to initialize the Click Database");
-    }
-}
-
 /** Helper function for printing JSON objects to debug output */
 std::string Registry::Impl::printJson(std::shared_ptr<JsonObject> jsonobj)
 {
@@ -133,89 +89,8 @@
     return retval;
 }
 
-std::shared_ptr<JsonObject> Registry::Impl::getClickManifest(const std::string& package)
-{
-    initClick();
-
-    auto retval = thread.executeOnThread<std::shared_ptr<JsonObject>>([this, package]() {
-        GError* error = nullptr;
-        auto mani = click_user_get_manifest(_clickUser.get(), package.c_str(), &error);
-
-        if (error != nullptr)
-        {
-            auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
-            g_debug("Error parsing manifest for package '%s': %s", package.c_str(), perror->message);
-            return std::shared_ptr<JsonObject>();
-        }
-
-        auto node = json_node_alloc();
-        json_node_init_object(node, mani);
-        json_object_unref(mani);
-
-        auto retval = std::shared_ptr<JsonObject>(json_node_dup_object(node), json_object_unref);
-
-        json_node_free(node);
-
-        return retval;
-    });
-
-    if (!retval)
-        throw std::runtime_error("Unable to get Click manifest for package: " + package);
-
-    return retval;
-}
-
-std::list<AppID::Package> Registry::Impl::getClickPackages()
-{
-    initClick();
-
-    return thread.executeOnThread<std::list<AppID::Package>>([this]() {
-        GError* error = nullptr;
-        GList* pkgs = click_user_get_package_names(_clickUser.get(), &error);
-
-        if (error != nullptr)
-        {
-            auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
-            throw std::runtime_error(perror->message);
-        }
-
-        std::list<AppID::Package> list;
-        for (GList* item = pkgs; item != nullptr; item = g_list_next(item))
-        {
-            auto pkgobj = static_cast<gchar*>(item->data);
-            if (pkgobj)
-            {
-                list.emplace_back(AppID::Package::from_raw(pkgobj));
-            }
-        }
-
-        g_list_free_full(pkgs, g_free);
-        return list;
-    });
-}
-
-std::string Registry::Impl::getClickDir(const std::string& package)
-{
-    initClick();
-
-    return thread.executeOnThread<std::string>([this, package]() {
-        GError* error = nullptr;
-        auto dir = click_user_get_path(_clickUser.get(), package.c_str(), &error);
-
-        if (error != nullptr)
-        {
-            auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
-            throw std::runtime_error(perror->message);
-        }
-
-        std::string cppdir(dir);
-        g_free(dir);
-        return cppdir;
-    });
-}
-
-/** Send an event to Zeitgeist using the registry thread so that
-        the callback comes back in the right place. */
+/** Send an event to Zietgeist using the registry thread so that
+    the callback comes back in the right place. */
 void Registry::Impl::zgSendEvent(AppID appid, const std::string& eventtype)
 {
     thread.executeOnThread([this, appid, eventtype] {

=== modified file 'libubuntu-app-launch/registry-impl.h'
--- libubuntu-app-launch/registry-impl.h	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/registry-impl.h	2017-03-21 03:26:40 +0000
@@ -23,7 +23,6 @@
 #include "jobs-base.h"
 #include "registry.h"
 #include "snapd-info.h"
-#include <click.h>
 #include <gio/gio.h>
 #include <json-glib/json-glib.h>
 #include <map>
@@ -47,15 +46,13 @@
 {
 public:
     Impl(Registry* registry);
+    Impl(Registry* registry, std::list<std::shared_ptr<app_store::Base>> appStores);
+
     virtual ~Impl()
     {
         thread.quit();
     }
 
-    std::shared_ptr<JsonObject> getClickManifest(const std::string& package);
-    std::list<AppID::Package> getClickPackages();
-    std::string getClickDir(const std::string& package);
-
     static void setManager(const std::shared_ptr<Registry::Manager>& manager,
                            const std::shared_ptr<Registry>& registry);
     void clearManager();
@@ -66,10 +63,8 @@
     /** DBus shared connection for the session bus */
     std::shared_ptr<GDBusConnection> _dbus;
 
-#ifdef ENABLE_SNAPPY
     /** Snapd information object */
     snapd::Info snapdInfo;
-#endif
 
     std::shared_ptr<jobs::manager::Base> jobs;
 
@@ -105,14 +100,14 @@
         return _appStores;
     }
 
+    void setAppStores(std::list<std::shared_ptr<app_store::Base>>& newlist)
+    {
+        _appStores = newlist;
+    }
+
 private:
     Registry* _registry; /**< The Registry that we're spawned from */
 
-    std::shared_ptr<ClickDB> _clickDB;     /**< Shared instance of the Click Database */
-    std::shared_ptr<ClickUser> _clickUser; /**< Click database filtered by the current user */
-
-    void initClick();
-
     /** Shared instance of the Zeitgeist Log */
     std::shared_ptr<ZeitgeistLog> zgLog_;
 

=== modified file 'libubuntu-app-launch/second-exec-core.c'
--- libubuntu-app-launch/second-exec-core.c	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/second-exec-core.c	2017-03-21 03:26:40 +0000
@@ -19,7 +19,7 @@
 
 #include <gio/gio.h>
 #include "libubuntu-app-launch/ubuntu-app-launch.h"
-#include "helpers.h"
+#include "utils.h"
 #include "second-exec-core.h"
 #include "ubuntu-app-launch-trace.h"
 #include "ual-tracepoint.h"

=== modified file 'libubuntu-app-launch/type-tagger.h'
--- libubuntu-app-launch/type-tagger.h	2016-06-09 14:55:34 +0000
+++ libubuntu-app-launch/type-tagger.h	2017-03-21 03:26:40 +0000
@@ -32,6 +32,14 @@
     {
         return _value;
     }
+    bool operator==(const TypeTagger<Tag, T>& b) const
+    {
+        return _value == b._value;
+    }
+    bool operator==(const T& b) const
+    {
+        return _value == b;
+    }
     ~TypeTagger()
     {
     }

=== renamed file 'ual-tracepoint.h' => 'libubuntu-app-launch/ual-tracepoint.h'
=== modified file 'libubuntu-app-launch/ubuntu-app-launch.cpp'
--- libubuntu-app-launch/ubuntu-app-launch.cpp	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.cpp	2017-03-21 03:26:40 +0000
@@ -28,7 +28,7 @@
 #include <libwhoopsie/recoverable-problem.h>
 
 #include "ubuntu-app-launch-trace.h"
-#include "helpers.h"
+#include "utils.h"
 #include "ual-tracepoint.h"
 #include "proxy-socket-demangler.h"
 }
@@ -423,11 +423,12 @@
 ubuntu_app_launch_observer_add_app_failed (UbuntuAppLaunchAppFailedObserver observer, gpointer user_data)
 {
 	auto context = std::shared_ptr<GMainContext>(g_main_context_ref_thread_default(), [](GMainContext * context) { g_clear_pointer(&context, g_main_context_unref); });
+	auto reg = ubuntu::app_launch::Registry::getDefault();
 
 	appFailedObservers.emplace(std::make_pair(
 		std::make_pair(observer, user_data),
 			core::ScopedConnection(
-				ubuntu::app_launch::Registry::appFailed().connect([context, observer, user_data](std::shared_ptr<ubuntu::app_launch::Application> app, std::shared_ptr<ubuntu::app_launch::Application::Instance> instance, ubuntu::app_launch::Registry::FailureType type) {
+				ubuntu::app_launch::Registry::appFailed(reg).connect([context, observer, user_data](std::shared_ptr<ubuntu::app_launch::Application> app, std::shared_ptr<ubuntu::app_launch::Application::Instance> instance, ubuntu::app_launch::Registry::FailureType type) {
 					std::string appid = app->appId();
 					executeOnContext(context, [appid, type, observer, user_data]() {
 						UbuntuAppLaunchAppFailed ctype{UBUNTU_APP_LAUNCH_APP_FAILED_CRASH};
@@ -524,7 +525,8 @@
 		}
 
 		return (gchar **)g_array_free(apps, FALSE);
-	} catch (...) {
+	} catch (const std::exception& e) {
+		g_debug("Unable to list applications: %s", e.what());
 		return nullptr;
 	}
 }
@@ -539,7 +541,8 @@
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
 		return app->instances().at(0)->primaryPid();
-	} catch (...) {
+	} catch (const std::exception& e) {
+		g_debug("Unable to get primary pid: %s", e.what());
 		return 0;
 	}
 }
@@ -637,6 +640,7 @@
 
 	auto appid = ubuntu::app_launch::AppID::discover(package, appname, version);
 	if (appid.empty()) {
+		g_debug("Triplet lookup for '%s' '%s' '%s' returned empty", pkg, app, ver);
 		return nullptr;
 	}
 
@@ -666,10 +670,10 @@
 			throw std::runtime_error{"Empty instance"};
 		}
 
-		return true;
+		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;
+		return FALSE;
 	}
 }
 
@@ -954,3 +958,9 @@
 	}
 }
 
+gboolean
+ubuntu_app_launch_application_info (const gchar * appid, gchar ** appdir, gchar ** appdesktop)
+{
+	/* TODO: Remove next ABI break */
+	return FALSE;
+}

=== renamed file 'helpers-shared.c' => 'libubuntu-app-launch/utils-shared.c'
--- helpers-shared.c	2016-11-09 23:13:38 +0000
+++ libubuntu-app-launch/utils-shared.c	2017-03-21 03:26:40 +0000
@@ -17,7 +17,7 @@
  *     Ted Gould <[e-mail]>
  */
 
-#include "helpers.h"
+#include "utils.h"
 #include <gio/gio.h>
 #include <cgmanager/cgmanager.h>
 

=== renamed file 'helpers.c' => 'libubuntu-app-launch/utils.c'
--- helpers.c	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/utils.c	2017-03-21 03:26:40 +0000
@@ -18,8 +18,7 @@
  */
 
 #include <json-glib/json-glib.h>
-#include <click.h>
-#include "helpers.h"
+#include "utils.h"
 
 /* Take an app ID and validate it and then break it up
    and spit it out.  These are newly allocated strings */
@@ -56,106 +55,6 @@
 	return TRUE;
 }
 
-/* Take a manifest, parse it, find the application and
-   and then return the path to the desktop file */
-gchar *
-manifest_to_desktop (const gchar * app_dir, const gchar * app_id)
-{
-	gchar * package = NULL;
-	gchar * application = NULL;
-	gchar * version = NULL;
-	ClickDB * db = NULL;
-	ClickUser * user = NULL;
-	JsonObject * manifest = NULL;
-	gchar * desktoppath = NULL;
-	GError * error = NULL;
-
-	if (!app_id_to_triplet(app_id, &package, &application, &version)) {
-		g_warning("Unable to parse triplet: %s", app_id);
-		return NULL;
-	}
-
-	db = click_db_new();
-	/* If TEST_CLICK_DB is unset, this reads the system database. */
-	click_db_read(db, g_getenv("TEST_CLICK_DB"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		goto manifest_out;
-	}
-	/* If TEST_CLICK_USER is unset, this uses the current user name. */
-	user = click_user_new_for_user(db, g_getenv("TEST_CLICK_USER"), &error);
-	if (error != NULL) {
-		g_warning("Unable to read Click database: %s", error->message);
-		goto manifest_out;
-	}
-	manifest = click_user_get_manifest(user, package, &error);
-	if (error != NULL) {
-		g_warning("Unable to get manifest for '%s': %s", package, error->message);
-		goto manifest_out;
-	}
-
-	if (!json_object_has_member(manifest, "version")) {
-		g_warning("Manifest '%s' doesn't have a version", package);
-		goto manifest_out;
-	}
-
-	if (g_strcmp0(json_object_get_string_member(manifest, "version"), version) != 0) {
-		g_warning("Manifest '%s' version '%s' doesn't match AppID version '%s'", package, json_object_get_string_member(manifest, "version"), version);
-		goto manifest_out;
-	}
-
-	if (!json_object_has_member(manifest, "hooks")) {
-		g_warning("Manifest '%s' doesn't have an hooks section", package);
-		goto manifest_out;
-	}
-
-	JsonObject * appsobj = json_object_get_object_member(manifest, "hooks");
-	if (appsobj == NULL) {
-		g_warning("Manifest '%s' has an hooks section that is not a JSON object", package);
-		goto manifest_out;
-	}
-
-	if (!json_object_has_member(appsobj, application)) {
-		g_warning("Manifest '%s' doesn't have the application '%s' defined", package, application);
-		goto manifest_out;
-	}
-
-	JsonObject * appobj = json_object_get_object_member(appsobj, application);
-	if (appobj == NULL) {
-		g_warning("Manifest '%s' has a definition for application '%s' that is not an object", package, application);
-		goto manifest_out;
-	}
-
-	gchar * filename = NULL;
-	if (json_object_has_member(appobj, "desktop")) {
-		filename = g_strdup(json_object_get_string_member(appobj, "desktop"));
-	} else {
-		filename = g_strdup_printf("%s.desktop", application);
-	}
-
-	desktoppath = g_build_filename(app_dir, filename, NULL);
-	g_free(filename);
-
-	if (!g_file_test(desktoppath, G_FILE_TEST_EXISTS)) {
-		g_warning("Application desktop file '%s' doesn't exist", desktoppath);
-		g_free(desktoppath);
-		desktoppath = NULL;
-	}
-
-manifest_out:
-	if (error != NULL)
-		g_error_free(error);
-	if (manifest != NULL)
-		json_object_unref(manifest);
-	g_clear_object(&user);
-	g_clear_object(&db);
-	g_free(package);
-	g_free(application);
-	g_free(version);
-
-	return desktoppath;
-}
-
 /* Take a desktop file, make sure that it makes sense and
    then return the exec line */
 gchar *

=== renamed file 'helpers.h' => 'libubuntu-app-launch/utils.h'
--- helpers.h	2017-03-21 03:26:39 +0000
+++ libubuntu-app-launch/utils.h	2017-03-21 03:26:40 +0000
@@ -25,8 +25,6 @@
                                   gchar **        package,
                                   gchar **        application,
                                   gchar **        version);
-gchar *   manifest_to_desktop    (const gchar *   app_dir,
-                                  const gchar *   app_id);
 gchar *   desktop_to_exec        (GKeyFile *      desktop_file,
                                   const gchar *   from);
 GArray *  desktop_exec_parse     (const gchar *   execline,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-03-21 03:26:39 +0000
+++ tests/CMakeLists.txt	2017-03-21 03:26:40 +0000
@@ -1,13 +1,5 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-configure_file ("click-db-dir/test.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/click-db-dir/test.conf" @ONLY)
-set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/click-db-dir/test.conf")
-
-if(CURL_FOUND)
-add_definitions ( -DENABLE_SNAPPY=1 )
-endif()
-
-
 # Google Test
 
 find_package(GMock)
@@ -17,14 +9,14 @@
 add_executable (helper-test helper-test.cc)
 add_definitions ( -DCMAKE_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" )
 add_definitions ( -DCMAKE_BINARY_DIR="${CMAKE_CURRENT_BINARY_DIR}" )
-target_link_libraries (helper-test helpers gtest_main ${GTEST_MAIN_LIBRARIES} ${DBUSTEST_LIBRARIES})
+target_link_libraries (helper-test launcher-static gtest_main ${GTEST_MAIN_LIBRARIES} ${DBUSTEST_LIBRARIES})
 
 add_test (helper-test helper-test)
 
 # Helper test
 
 add_executable (helper-handshake-test helper-handshake-test.cc)
-target_link_libraries (helper-handshake-test helpers gtest_main ${GTEST_MAIN_LIBRARIES})
+target_link_libraries (helper-handshake-test launcher-static gtest_main ${GTEST_MAIN_LIBRARIES})
 
 add_test (helper-handshake-test helper-handshake-test)
 
@@ -33,7 +25,7 @@
 include_directories("${CMAKE_SOURCE_DIR}/libubuntu-app-launch")
 add_definitions ( -DSPEW_UTILITY="${CMAKE_CURRENT_BINARY_DIR}/data-spew" )
 add_definitions ( -DSESSION_TEMP_FILE="${CMAKE_CURRENT_BINARY_DIR}/libual-test-session-start-temp" )
-add_definitions ( -DSOCKET_DEMANGLER="${CMAKE_BINARY_DIR}/socket-demangler" )
+add_definitions ( -DSOCKET_DEMANGLER="${CMAKE_BINARY_DIR}/utils/socket-demangler" )
 add_definitions ( -DSOCKET_DEMANGLER_INSTALL="${pkglibexecdir}/socket-demangler" )
 add_definitions ( -DSOCKET_TOOL="${CMAKE_CURRENT_BINARY_DIR}/socket-tool" )
 add_definitions ( -DSNAP_BASEDIR="${CMAKE_CURRENT_SOURCE_DIR}/snap-basedir" )
@@ -46,7 +38,7 @@
 add_executable (libual-cpp-test
 	libual-cpp-test.cc
 	mir-mock.cpp)
-target_link_libraries (libual-cpp-test gtest_main ${GTEST_MAIN_LIBRARIES} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} launcher-static)
+target_link_libraries (libual-cpp-test gtest_main ${GMOCK_LIBRARIES} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} launcher-static)
 
 add_executable (data-spew
 	data-spew.c)
@@ -122,12 +114,6 @@
 
 file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-# Desktop Hook Test
-
-configure_file ("click-desktop-hook-db/test.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/click-desktop-hook-db/test.conf" @ONLY)
-configure_file ("desktop-hook-test.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/desktop-hook-test.sh" @ONLY)
-add_test (desktop-hook-test desktop-hook-test.sh)
-
 # XMir helper Test
 
 configure_file ("xmir-helper-test.in" "${CMAKE_CURRENT_BINARY_DIR}/xmir-helper-test" @ONLY)
@@ -144,6 +130,7 @@
 	COMMAND clang-format -i -style=file
 	application-info-desktop.cpp
 	libual-cpp-test.cc
+	libual-test.cc
 	list-apps.cpp
 	eventually-fixture.h
 	info-watcher-zg.cpp

=== modified file 'tests/application-info-desktop.cpp'
--- tests/application-info-desktop.cpp	2017-02-09 19:43:14 +0000
+++ tests/application-info-desktop.cpp	2017-03-21 03:26:40 +0000
@@ -408,10 +408,11 @@
         .WillOnce(testing::Return(ubuntu::app_launch::Application::Info::Popularity::from_raw(5u)));
 
     auto keyfile = defaultKeyfile();
-    EXPECT_EQ(5u, ubuntu::app_launch::app_info::Desktop(simpleAppID(), keyfile, "/", {},
-                                                        ubuntu::app_launch::app_info::DesktopFlags::NONE, registry())
-                      .popularity()
-                      .value());
+    EXPECT_EQ(5u,
+              ubuntu::app_launch::app_info::Desktop(simpleAppID(), keyfile, "/", {},
+                                                    ubuntu::app_launch::app_info::DesktopFlags::NONE, registry())
+                  .popularity()
+                  .value());
 }
 
 }  // anonymous namespace

=== modified file 'tests/applications/foo.desktop'
--- tests/applications/foo.desktop	2017-01-10 18:41:25 +0000
+++ tests/applications/foo.desktop	2017-03-21 03:26:40 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Foo
 Type=Application
-Exec=foo
+Exec=foo %U
 NoDisplay=false
 Hidden=false
 Terminal=false

=== removed directory 'tests/click-app-dir'
=== removed directory 'tests/click-app-dir/.click'
=== removed directory 'tests/click-app-dir/.click/info'
=== removed file 'tests/click-app-dir/.click/info/chatter.robert-ancell.manifest'
--- tests/click-app-dir/.click/info/chatter.robert-ancell.manifest	2016-08-23 14:52:49 +0000
+++ tests/click-app-dir/.click/info/chatter.robert-ancell.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-    "version": "2",
-    "hooks": {
-        "chatter": {
-            "desktop": "chatter.desktop"
-        }
-    }
-}

=== removed file 'tests/click-app-dir/.click/info/com.test.bad-version.manifest'
--- tests/click-app-dir/.click/info/com.test.bad-version.manifest	2013-09-24 03:48:52 +0000
+++ tests/click-app-dir/.click/info/com.test.bad-version.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-	"version": "4.5.6",
-	"hooks": {
-		"application": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed file 'tests/click-app-dir/.click/info/com.test.good.manifest'
--- tests/click-app-dir/.click/info/com.test.good.manifest	2014-08-25 20:01:18 +0000
+++ tests/click-app-dir/.click/info/com.test.good.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-	"version": "1.2.3",
-	"hooks": {
-		"application": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed file 'tests/click-app-dir/.click/info/com.test.mir.manifest'
--- tests/click-app-dir/.click/info/com.test.mir.manifest	2015-07-02 02:38:56 +0000
+++ tests/click-app-dir/.click/info/com.test.mir.manifest	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-{
-	"version": "1",
-	"hooks": {
-		"mir": {
-			"desktop": "xmir.desktop"
-		},
-		"nomir": {
-			"desktop": "noxmir.desktop"
-		}
-	}
-}

=== removed file 'tests/click-app-dir/.click/info/com.test.multiple.manifest'
--- tests/click-app-dir/.click/info/com.test.multiple.manifest	2014-01-29 02:19:41 +0000
+++ tests/click-app-dir/.click/info/com.test.multiple.manifest	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-{
-	"version": "1.2.3",
-	"hooks": {
-		"first": {
-			"desktop": "application.desktop"
-		},
-		"second": {
-			"desktop": "application.desktop"
-		},
-		"third": {
-			"desktop": "application.desktop"
-		},
-		"fourth": {
-			"desktop": "application.desktop"
-		},
-		"fifth": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed file 'tests/click-app-dir/.click/info/com.test.no-app.manifest'
--- tests/click-app-dir/.click/info/com.test.no-app.manifest	2013-09-24 03:48:52 +0000
+++ tests/click-app-dir/.click/info/com.test.no-app.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-	"version": "1.2.3",
-	"hooks": {
-		"no-application": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed file 'tests/click-app-dir/.click/info/com.test.no-hooks.manifest'
--- tests/click-app-dir/.click/info/com.test.no-hooks.manifest	2013-09-24 03:48:52 +0000
+++ tests/click-app-dir/.click/info/com.test.no-hooks.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-	"version": "1.2.3",
-	"hookie": {
-		"application": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed file 'tests/click-app-dir/.click/info/com.test.no-json.manifest'
--- tests/click-app-dir/.click/info/com.test.no-json.manifest	2013-09-24 03:48:52 +0000
+++ tests/click-app-dir/.click/info/com.test.no-json.manifest	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<xmlFile>
-	<moreData>
-		Lovin' some data
-	</moreData>
-</xmlFile>

=== removed file 'tests/click-app-dir/.click/info/com.test.no-object.manifest'
--- tests/click-app-dir/.click/info/com.test.no-object.manifest	2013-09-24 03:48:52 +0000
+++ tests/click-app-dir/.click/info/com.test.no-object.manifest	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-[
-	"foo",
-	"bar",
-	5,
-	6
-]

=== removed file 'tests/click-app-dir/.click/info/com.test.no-version.manifest'
--- tests/click-app-dir/.click/info/com.test.no-version.manifest	2013-09-24 03:48:52 +0000
+++ tests/click-app-dir/.click/info/com.test.no-version.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-	"ver": "1.2.3",
-	"hooks": {
-		"application": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed file 'tests/click-app-dir/application.desktop'
--- tests/click-app-dir/application.desktop	2016-07-15 21:51:39 +0000
+++ tests/click-app-dir/application.desktop	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Application
-Type=Application
-Exec=grep
-Icon=foo.png

=== removed file 'tests/click-app-dir/chatter.desktop'
--- tests/click-app-dir/chatter.desktop	2016-04-27 13:44:44 +0000
+++ tests/click-app-dir/chatter.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Chatter
-Comment=Chat on Internet Relay Chat (IRC) networks
-Keywords=irc,online,chat,freenode
-Exec=chatter
-Icon=chatter.png
-Terminal=false
-Type=Application
-X-Ubuntu-Touch=true

=== removed file 'tests/click-app-dir/noxmir.desktop'
--- tests/click-app-dir/noxmir.desktop	2016-07-15 19:18:49 +0000
+++ tests/click-app-dir/noxmir.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=No XMir Needed
-Type=Application
-Exec=noxmir
-NoDisplay=false
-Hidden=false
-Terminal=false
-X-Ubuntu-XMir-Enable=false
-Icon=nomir.png

=== removed file 'tests/click-app-dir/xmir.desktop'
--- tests/click-app-dir/xmir.desktop	2016-07-15 19:18:49 +0000
+++ tests/click-app-dir/xmir.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=X Application
-Type=Application
-Exec=xfoo
-NoDisplay=false
-Hidden=false
-Terminal=false
-X-Ubuntu-XMir-Enable=true
-Icon=xfoo.png

=== removed directory 'tests/click-db-dir'
=== removed file 'tests/click-db-dir/test.conf.in'
--- tests/click-db-dir/test.conf.in	2014-03-07 12:33:01 +0000
+++ tests/click-db-dir/test.conf.in	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[Click Database]
-root = @CMAKE_CURRENT_SOURCE_DIR@/click-root-dir

=== removed directory 'tests/click-desktop-hook-db'
=== removed file 'tests/click-desktop-hook-db/test.conf.in'
--- tests/click-desktop-hook-db/test.conf.in	2015-04-06 21:28:13 +0000
+++ tests/click-desktop-hook-db/test.conf.in	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[Click Database]
-root = @CMAKE_CURRENT_BINARY_DIR@/click-root-desktop-hook

=== removed directory 'tests/click-root-dir'
=== removed directory 'tests/click-root-dir/.click'
=== removed directory 'tests/click-root-dir/.click/users'
=== removed directory 'tests/click-root-dir/.click/users/test-user'
=== removed directory 'tests/click-root-dir/.click/users/test-user-4'
=== removed symlink 'tests/click-root-dir/.click/users/test-user-4/com.test.good'
=== target was u'../../../com.test.good/1.2.4/'
=== removed directory 'tests/click-root-dir/.click/users/test-user-5'
=== removed symlink 'tests/click-root-dir/.click/users/test-user-5/com.test.good'
=== target was u'../../../com.test.good/1.2.5/'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/chatter.robert-ancell'
=== target was u'../../../chatter.robert-ancell/2/'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.bad-version'
=== target was u'../../../com.test.bad-version/1.2.3'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.good'
=== target was u'../../../com.test.good/1.2.3'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.mir'
=== target was u'../../../com.test.mir/1/'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.multiple'
=== target was u'../../../com.test.multiple/1.2.3'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.no-app'
=== target was u'../../../com.test.no-app/1.2.3'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.no-hooks'
=== target was u'../../../com.test.no-hooks/1.2.3'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.no-json'
=== target was u'../../../com.test.no-json/1.2.3'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.no-object'
=== target was u'../../../com.test.no-object/1.2.3'
=== removed symlink 'tests/click-root-dir/.click/users/test-user/com.test.no-version'
=== target was u'../../../com.test.no-version/1.2.3'
=== removed directory 'tests/click-root-dir/chatter.robert-ancell'
=== removed symlink 'tests/click-root-dir/chatter.robert-ancell/2'
=== target was u'../../click-app-dir/'
=== removed directory 'tests/click-root-dir/com.test.bad-version'
=== removed symlink 'tests/click-root-dir/com.test.bad-version/1.2.3'
=== target was u'../../click-app-dir'
=== removed directory 'tests/click-root-dir/com.test.good'
=== removed symlink 'tests/click-root-dir/com.test.good/1.2.3'
=== target was u'../../click-app-dir'
=== removed directory 'tests/click-root-dir/com.test.good/1.2.4'
=== removed directory 'tests/click-root-dir/com.test.good/1.2.4/.click'
=== removed directory 'tests/click-root-dir/com.test.good/1.2.4/.click/info'
=== removed file 'tests/click-root-dir/com.test.good/1.2.4/.click/info/com.test.good.manifest'
--- tests/click-root-dir/com.test.good/1.2.4/.click/info/com.test.good.manifest	2015-06-03 20:26:39 +0000
+++ tests/click-root-dir/com.test.good/1.2.4/.click/info/com.test.good.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-	"version": "1.2.4",
-	"hooks": {
-		"application": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed symlink 'tests/click-root-dir/com.test.good/1.2.4/application.desktop'
=== target was u'../../../click-app-dir/application.desktop'
=== removed directory 'tests/click-root-dir/com.test.good/1.2.5'
=== removed directory 'tests/click-root-dir/com.test.good/1.2.5/.click'
=== removed directory 'tests/click-root-dir/com.test.good/1.2.5/.click/info'
=== removed file 'tests/click-root-dir/com.test.good/1.2.5/.click/info/com.test.good.manifest'
--- tests/click-root-dir/com.test.good/1.2.5/.click/info/com.test.good.manifest	2015-06-03 20:26:39 +0000
+++ tests/click-root-dir/com.test.good/1.2.5/.click/info/com.test.good.manifest	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{
-	"version": "1.2.5",
-	"hooks": {
-		"application": {
-			"desktop": "application.desktop"
-		}
-	}
-}

=== removed symlink 'tests/click-root-dir/com.test.good/1.2.5/application.desktop'
=== target was u'../../../click-app-dir/application.desktop'
=== removed directory 'tests/click-root-dir/com.test.mir'
=== removed symlink 'tests/click-root-dir/com.test.mir/1'
=== target was u'../../click-app-dir/'
=== removed directory 'tests/click-root-dir/com.test.multiple'
=== removed symlink 'tests/click-root-dir/com.test.multiple/1.2.3'
=== target was u'../../click-app-dir'
=== removed directory 'tests/click-root-dir/com.test.no-app'
=== removed symlink 'tests/click-root-dir/com.test.no-app/1.2.3'
=== target was u'../../click-app-dir'
=== removed directory 'tests/click-root-dir/com.test.no-hooks'
=== removed symlink 'tests/click-root-dir/com.test.no-hooks/1.2.3'
=== target was u'../../click-app-dir'
=== removed directory 'tests/click-root-dir/com.test.no-json'
=== removed symlink 'tests/click-root-dir/com.test.no-json/1.2.3'
=== target was u'../../click-app-dir'
=== removed directory 'tests/click-root-dir/com.test.no-object'
=== removed symlink 'tests/click-root-dir/com.test.no-object/1.2.3'
=== target was u'../../click-app-dir'
=== removed directory 'tests/click-root-dir/com.test.no-version'
=== removed symlink 'tests/click-root-dir/com.test.no-version/1.2.3'
=== target was u'../../click-app-dir'
=== removed file 'tests/desktop-hook-test.sh.in'
--- tests/desktop-hook-test.sh.in	2015-06-03 20:36:34 +0000
+++ tests/desktop-hook-test.sh.in	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-#!/bin/bash -e
-
-TEST_DIR=@CMAKE_CURRENT_BINARY_DIR@
-SRC_DIR=@CMAKE_CURRENT_SOURCE_DIR@
-
-CACHE_DIR=${TEST_DIR}/desktop-hook-test-click-dir
-CLICK_DIR=${CACHE_DIR}/ubuntu-app-launch/desktop/
-
-DATA_DIR=${TEST_DIR}/desktop-hook-test-apps-dir
-APPS_DIR=${DATA_DIR}/applications/
-
-# Remove the old directories
-rm -rf ${CACHE_DIR}
-rm -rf ${DATA_DIR}
-rm -f @CMAKE_CURRENT_BINARY_DIR@/click-root-desktop-hook
-
-# Copy our source applications
-mkdir -p ${CLICK_DIR}
-cp ${SRC_DIR}/link-farm/* ${CLICK_DIR}
-
-# Build our root dir
-ln -s @CMAKE_CURRENT_SOURCE_DIR@/click-root-dir @CMAKE_CURRENT_BINARY_DIR@/click-root-desktop-hook
-
-# Setup the environment
-export XDG_CACHE_HOME=${CACHE_DIR}
-export XDG_DATA_HOME=${DATA_DIR}
-export TEST_CLICK_DB=@CMAKE_CURRENT_BINARY_DIR@/click-desktop-hook-db
-export TEST_CLICK_USER=test-user
-
-# Run the tool
-@CMAKE_BINARY_DIR@/desktop-hook
-
-# Check that the files exist
-
-if [ ! -e ${APPS_DIR}/com.test.good_application_1.2.3.desktop ] ; then
-	echo "Desktop file not created for: com.test.good_application_1.2.3"
-	exit 1
-fi
-
-if [ ! -e ${APPS_DIR}/com.test.multiple_first_1.2.3.desktop ] ; then
-	echo "Desktop file not created for: com.test.multiple_first_1.2.3"
-	exit 1
-fi
-
-# Verify we're adding containment to them
-
-grep "^Exec=aa-exec-click -p com.test.good_application_1.2.3 --" ${APPS_DIR}/com.test.good_application_1.2.3.desktop > /dev/null
-grep "^Exec=aa-exec-click -p com.test.multiple_first_1.2.3 --" ${APPS_DIR}/com.test.multiple_first_1.2.3.desktop > /dev/null
-
-# Make sure they have the AppID (people started using it) :-/
-
-grep "^X-Ubuntu-Application-ID=com.test.good_application_1.2.3" ${APPS_DIR}/com.test.good_application_1.2.3.desktop > /dev/null
-grep "^X-Ubuntu-Application-ID=com.test.multiple_first_1.2.3" ${APPS_DIR}/com.test.multiple_first_1.2.3.desktop > /dev/null
-
-# Remove a file and ensure it gets recreated
-
-rm -f ${APPS_DIR}/com.test.good_application_1.2.3.desktop
-@CMAKE_BINARY_DIR@/desktop-hook
-
-if [ ! -e ${APPS_DIR}/com.test.good_application_1.2.3.desktop ] ; then
-	echo "Desktop file not recreated for: com.test.good_application_1.2.3"
-	exit 1
-fi
-
-# Remove a source file and make sure it goes
-
-rm -f ${CLICK_DIR}/com.test.multiple_first_1.2.3.desktop
-@CMAKE_BINARY_DIR@/desktop-hook
-if [ -e ${APPS_DIR}/com.test.multiple_first_1.2.3.desktop ] ; then
-	echo "Not cleaning up deleted files"
-	exit 1
-fi
-
-# Verify the good file is in the desktop hook root
-grep "^X-Ubuntu-UAL-Source-Desktop=@CMAKE_CURRENT_BINARY_DIR@/click-root-desktop-hook" ${APPS_DIR}/com.test.good_application_1.2.3.desktop > /dev/null 
-
-# Remove our root
-rm -f @CMAKE_CURRENT_BINARY_DIR@/click-root-desktop-hook
-
-# Point to the new db and run
-export TEST_CLICK_DB=@CMAKE_CURRENT_BINARY_DIR@/click-db-dir
-@CMAKE_BINARY_DIR@/desktop-hook
-
-# Verify that we have the file and it's in the new root
-if [ ! -e ${APPS_DIR}/com.test.good_application_1.2.3.desktop ] ; then
-	echo "Desktop file not created for: com.test.good_application_1.2.3"
-	exit 1
-fi
-
-grep "^X-Ubuntu-UAL-Source-Desktop=@CMAKE_CURRENT_SOURCE_DIR@/click-root-dir" ${APPS_DIR}/com.test.good_application_1.2.3.desktop > /dev/null 
-
-# Upgrade the good application
-
-mv ${CLICK_DIR}/com.test.good_application_1.2.3.desktop ${CLICK_DIR}/com.test.good_application_1.2.4.desktop
-export TEST_CLICK_USER=test-user-4
-
-@CMAKE_BINARY_DIR@/desktop-hook
-
-if [ -e ${APPS_DIR}/com.test.good_application_1.2.3.desktop ] ; then
-	echo "Desktop file not removed for: com.test.good_application_1.2.3"
-	exit 1
-fi
-
-if [ ! -e ${APPS_DIR}/com.test.good_application_1.2.4.desktop ] ; then
-	echo "Desktop file not created for: com.test.good_application_1.2.4"
-	exit 1
-fi
-
-# Upgrade the good application, but don't have a Source line like in an upgrade scenario
-
-mv ${CLICK_DIR}/com.test.good_application_1.2.4.desktop ${CLICK_DIR}/com.test.good_application_1.2.5.desktop
-cat ${APPS_DIR}/com.test.good_application_1.2.4.desktop | grep -v "^X-Ubuntu-UAL-Source-Desktop" > ${APPS_DIR}/com.test.good_application_1.2.4.desktop.tmp
-rm ${APPS_DIR}/com.test.good_application_1.2.4.desktop
-mv ${APPS_DIR}/com.test.good_application_1.2.4.desktop.tmp ${APPS_DIR}/com.test.good_application_1.2.4.desktop
-
-export TEST_CLICK_USER=test-user-5
-
-
-@CMAKE_BINARY_DIR@/desktop-hook
-
-if [ -e ${APPS_DIR}/com.test.good_application_1.2.4.desktop ] ; then
-	echo "Desktop file not removed for: com.test.good_application_1.2.4"
-	exit 1
-fi
-
-if [ ! -e ${APPS_DIR}/com.test.good_application_1.2.5.desktop ] ; then
-	echo "Desktop file not created for: com.test.good_application_1.2.5"
-	exit 1
-fi

=== modified file 'tests/helper-handshake-test.cc'
--- tests/helper-handshake-test.cc	2016-12-14 21:23:09 +0000
+++ tests/helper-handshake-test.cc	2017-03-21 03:26:40 +0000
@@ -22,7 +22,7 @@
 #include <gio/gio.h>
 
 extern "C" {
-#include "../helpers.h"
+#include "utils.h"
 }
 
 class HelperHandshakeTest : public ::testing::Test

=== modified file 'tests/helper-test.cc'
--- tests/helper-test.cc	2017-03-21 03:26:39 +0000
+++ tests/helper-test.cc	2017-03-21 03:26:40 +0000
@@ -23,7 +23,7 @@
 #include <gio/gio.h>
 
 extern "C" {
-#include "../helpers.h"
+#include "utils.h"
 }
 
 class HelperTest : public ::testing::Test
@@ -78,7 +78,7 @@
 	g_array_free(output, TRUE);
 
 	/* Little u with a single URL */
-	output = desktop_exec_parse("foo %u", "http://ubuntu.com");
+	output = desktop_exec_parse("foo %U", "http://ubuntu.com");
 	ASSERT_EQ(guint(2), output->len);
 	ASSERT_STREQ(g_array_index(output, gchar *, 0), "foo");
 	ASSERT_STREQ(g_array_index(output, gchar *, 1), "http://ubuntu.com");
@@ -273,7 +273,7 @@
 	ASSERT_TRUE(g_key_file_load_from_file(keyfile, CMAKE_SOURCE_DIR "/applications/foo.desktop", G_KEY_FILE_NONE, NULL));
 	exec = desktop_to_exec(keyfile, "");
 	ASSERT_TRUE(exec != NULL);
-	ASSERT_STREQ(exec, "foo");
+	ASSERT_STREQ(exec, "foo %U");
 	g_free(exec);
 	g_key_file_free(keyfile);
 
@@ -316,42 +316,3 @@
 	return;
 }
 
-TEST_F(HelperTest, ManifestToDesktop)
-{
-	gchar * desktop = NULL;
-
-	g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
-	g_setenv("TEST_CLICK_USER", "test-user", TRUE);
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.good_application_1.2.3");
-	ASSERT_STREQ(CMAKE_SOURCE_DIR "/click-app-dir/application.desktop", desktop);
-	g_free(desktop);
-	desktop = NULL;
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.bad-version_application_1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.no-app_application_1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.no-hooks_application_1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.no-version_application_1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.no-exist_application_1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.no-json_application_1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.no-object_application_1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	/* Bad App ID */
-	desktop = manifest_to_desktop(CMAKE_SOURCE_DIR "/click-app-dir/", "com.test.good_application-1.2.3");
-	ASSERT_TRUE(desktop == NULL);
-
-	return;
-}

=== modified file 'tests/libertine-service.h'
--- tests/libertine-service.h	2017-02-15 15:03:41 +0000
+++ tests/libertine-service.h	2017-03-21 03:26:40 +0000
@@ -42,6 +42,7 @@
 
         wait = dbus_test_task_new();
         dbus_test_task_set_wait_for(wait, "com.canonical.libertine.Service");
+        dbus_test_task_set_name(wait, "lib-wait");
     }
 
     ~LibertineService()

=== modified file 'tests/libual-cpp-test.cc'
--- tests/libual-cpp-test.cc	2017-03-21 03:26:39 +0000
+++ tests/libual-cpp-test.cc	2017-03-21 03:26:40 +0000
@@ -31,6 +31,7 @@
 
 #include "application.h"
 #include "glib-thread.h"
+#include "helper-impl.h"
 #include "helper.h"
 #include "jobs-base.h"
 #include "registry.h"
@@ -39,17 +40,15 @@
 #include "eventually-fixture.h"
 #include "libertine-service.h"
 #include "mir-mock.h"
+#include "registry-mock.h"
+#include "snapd-mock.h"
 #include "spew-master.h"
 #include "systemd-mock.h"
 #include "zg-mock.h"
 
-#ifdef ENABLE_SNAPPY
-#include "snapd-mock.h"
-
 #define LOCAL_SNAPD_TEST_SOCKET (SNAPD_TEST_SOCKET "-libual-cpp-test")
-#endif
 
-#define CGROUP_DIR (CMAKE_BINARY_DIR "/systemd-cgroups")
+#define CGROUP_DIR (CMAKE_BINARY_DIR "/systemd-libual-cpp-cgroups")
 
 class LibUAL : public EventuallyFixture
 {
@@ -99,6 +98,7 @@
                              const std::shared_ptr<ubuntu::app_launch::Application::Instance>& instance,
                              std::function<void(bool)> reply) override
         {
+            g_debug("Manager Mock: Starting Request: %s", std::string(app->appId()).c_str());
             thread.timeout(startingTimeout, [this, app, instance, reply]() {
                 lastStartedApp = app->appId();
                 reply(startingResponse);
@@ -109,6 +109,7 @@
                           const std::shared_ptr<ubuntu::app_launch::Application::Instance>& instance,
                           std::function<void(bool)> reply) override
         {
+            g_debug("Manager Mock: Focus Request: %s", std::string(app->appId()).c_str());
             thread.timeout(focusTimeout, [this, app, instance, reply]() {
                 lastFocusedApp = app->appId();
                 reply(focusResponse);
@@ -119,6 +120,7 @@
                            const std::shared_ptr<ubuntu::app_launch::Application::Instance>& instance,
                            std::function<void(bool)> reply) override
         {
+            g_debug("Manager Mock: Resume Request: %s", std::string(app->appId()).c_str());
             thread.timeout(resumeTimeout, [this, app, instance, reply]() {
                 lastResumedApp = app->appId();
                 reply(resumeResponse);
@@ -147,24 +149,15 @@
 
     virtual void SetUp()
     {
-        /* Click DB test mode */
-        g_setenv("TEST_CLICK_DB", CMAKE_BINARY_DIR "/click-db-dir", TRUE);
-        g_setenv("TEST_CLICK_USER", "test-user", TRUE);
-
-        gchar* linkfarmpath = g_build_filename(CMAKE_SOURCE_DIR, "link-farm", NULL);
-        g_setenv("UBUNTU_APP_LAUNCH_LINK_FARM", linkfarmpath, TRUE);
-        g_free(linkfarmpath);
-
         g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE);
         g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE);
         g_setenv("XDG_DATA_HOME", CMAKE_SOURCE_DIR "/libertine-home", TRUE);
 
-#ifdef ENABLE_SNAPPY
         g_setenv("UBUNTU_APP_LAUNCH_SNAPD_SOCKET", LOCAL_SNAPD_TEST_SOCKET, TRUE);
         g_setenv("UBUNTU_APP_LAUNCH_SNAP_BASEDIR", SNAP_BASEDIR, TRUE);
         g_setenv("UBUNTU_APP_LAUNCH_DISABLE_SNAPD_TIMEOUT", "You betcha!", TRUE);
         g_unlink(LOCAL_SNAPD_TEST_SOCKET);
-#endif
+
         g_setenv("UBUNTU_APP_LAUNCH_SYSTEMD_PATH", "/this/should/not/exist", TRUE);
         /* Setting the cgroup temp directory */
         g_setenv("UBUNTU_APP_LAUNCH_SYSTEMD_CGROUP_ROOT", CGROUP_DIR, TRUE);
@@ -175,12 +168,11 @@
 
         systemd = std::make_shared<SystemdMock>(
             std::list<SystemdMock::Instance>{
-                {"application-click", "com.test.good_application_1.2.3", {}, getpid(), {100, 200, 300}},
                 {"application-snap", "unity8-package_foo_x123", {}, getpid(), {100, 200, 300}},
                 {"application-legacy", "multiple", "2342345", 5678, {100, 200, 300}},
-                {"application-legacy", "single", {}, 5678, {100, 200, 300}},
-                {"helper", "com.foo_bar_43.23.12", {}, 1, {100, 200, 300}},
-                {"helper", "com.bar_foo_8432.13.1", "24034582324132", 1, {100, 200, 300}}},
+                {"application-legacy", "single", {}, getpid(), {getpid()}},
+                {"untrusted-helper", "com.foo_bar_43.23.12", {}, 1, {100, 200, 300}},
+                {"untrusted-helper", "com.bar_foo_8432.13.1", "24034582324132", 1, {100, 200, 300}}},
             CGROUP_DIR);
 
         /* Put it together */
@@ -197,9 +189,6 @@
         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);
-
         registry = std::make_shared<ubuntu::app_launch::Registry>();
 
         manager = std::make_shared<ManagerMock>();
@@ -226,9 +215,7 @@
 
         ASSERT_EVENTUALLY_EQ(nullptr, bus);
 
-#ifdef ENABLE_SNAPPY
         g_unlink(LOCAL_SNAPD_TEST_SOCKET);
-#endif
     }
 
     static std::string find_env(std::set<std::string>& envs, std::string var)
@@ -266,6 +253,55 @@
         }
         return split_env(val).second == value;
     }
+
+    void storeForApp(const ubuntu::app_launch::AppID& appid, const std::string& jobtype, const std::string& instanceid)
+    {
+        auto store = storeForHelper(appid);
+
+        ON_CALL(*store, list(testing::_))
+            .WillByDefault(testing::Return(std::list<std::shared_ptr<ubuntu::app_launch::Application>>{}));
+
+        auto app = std::make_shared<MockApp>(appid, registry);
+        ON_CALL(*store, create(appid, testing::_)).WillByDefault(testing::Return(app));
+
+        if (!instanceid.empty())
+        {
+            std::vector<ubuntu::app_launch::Application::URL> urls;
+            auto inst = std::make_shared<MockInst>(appid, jobtype, instanceid, urls, registry);
+            ON_CALL(*app, findInstance(instanceid)).WillByDefault(testing::Return(inst));
+            ON_CALL(*app, launch(testing::_)).WillByDefault(testing::Return(inst));
+            ON_CALL(*app, launchTest(testing::_)).WillByDefault(testing::Return(inst));
+            ON_CALL(*app, hasInstances()).WillByDefault(testing::Return(true));
+        }
+        else
+        {
+            ON_CALL(*app, hasInstances()).WillByDefault(testing::Return(false));
+        }
+
+        std::list<std::shared_ptr<ubuntu::app_launch::app_store::Base>> list;
+        list.push_back(store);
+        registry->impl->setAppStores(list);
+    }
+
+    std::shared_ptr<MockStore> storeForHelper(const ubuntu::app_launch::AppID& appid)
+    {
+        /* Setup a store for looking up the AppID */
+        auto store = std::make_shared<MockStore>();
+
+        ON_CALL(*store, verifyPackage(appid.package, testing::_)).WillByDefault(testing::Return(true));
+        ON_CALL(*store, verifyAppname(appid.package, appid.appname, testing::_)).WillByDefault(testing::Return(true));
+        ON_CALL(*store, findAppname(appid.package, testing::_, testing::_))
+            .WillByDefault(testing::Return(appid.appname));
+        ON_CALL(*store, findVersion(appid.package, appid.appname, testing::_))
+            .WillByDefault(testing::Return(appid.version));
+        ON_CALL(*store, hasAppId(appid, testing::_)).WillByDefault(testing::Return(true));
+
+        std::list<std::shared_ptr<ubuntu::app_launch::app_store::Base>> list;
+        list.push_back(store);
+        registry->impl->setAppStores(list);
+
+        return store;
+    }
 };
 
 #define TASK_STATE(task)                                                   \
@@ -274,7 +310,6 @@
         [&task] { return dbus_test_task_get_state(DBUS_TEST_TASK(task)); } \
     }
 
-#ifdef ENABLE_SNAPPY
 /* Snapd mock data */
 static std::pair<std::string, std::string> interfaces{
     "GET /v2/interfaces HTTP/1.1\r\nHost: snapd\r\nAccept: */*\r\n\r\n",
@@ -286,8 +321,8 @@
         "unity8-package", "active", "app", "1.2.3.4", "x123", {"foo", "single", "xmir", "noxmir"})))};
 static std::pair<std::string, std::string> helloPackage{
     "GET /v2/snaps/hello HTTP/1.1\r\nHost: snapd\r\nAccept: */*\r\n\r\n",
-    SnapdMock::httpJsonResponse(SnapdMock::snapdOkay(SnapdMock::packageJson(
-        "hello", "active", "app", "1.0", "1", {"hello"})))};
+    SnapdMock::httpJsonResponse(
+        SnapdMock::snapdOkay(SnapdMock::packageJson("hello", "active", "app", "1.0", "1", {"hello"})))};
 
 TEST_F(LibUAL, ApplicationIdSnap)
 {
@@ -356,23 +391,20 @@
 
     auto appid = ubuntu::app_launch::AppID::parse("hello_hello_1");
 
-    try {
-        ubuntu::app_launch::Application::create(appid, registry);
-        FAIL() << "Expected std::runtime_error";
-    }
-    catch(std::runtime_error const & err) {
-        EXPECT_EQ(err.what(), std::string("Graphical interface not found for: hello_hello_1"));
-    }
-    catch(...) {
-        FAIL() << "Expected std::runtime_error";
-    }
+    EXPECT_THROW(ubuntu::app_launch::Application::create(appid, registry), std::runtime_error);
 }
-#endif
 
 TEST_F(LibUAL, ApplicationPid)
 {
+    /* Queries come in threes, apparently */
+    SnapdMock snapd{LOCAL_SNAPD_TEST_SOCKET,
+                    {
+                        u8Package, interfaces, u8Package, /* App */
+                    }};
+    registry = std::make_shared<ubuntu::app_launch::Registry>();
+
     /* Check bad params */
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto appid = ubuntu::app_launch::AppID::parse("unity8-package_foo_x123");
     auto app = ubuntu::app_launch::Application::create(appid, registry);
 
     ASSERT_LT(0, int(app->instances().size()));
@@ -393,93 +425,143 @@
     ASSERT_LT(0, int(instances.size()));
     EXPECT_EQ(5678, instances[0]->primaryPid());
 
-    /* Look at the full PID list from CG Manager */
-    DbusTestDbusMockObject* cgobject = dbus_test_dbus_mock_get_object(cgmock, "/org/linuxcontainers/cgmanager",
-                                                                      "org.linuxcontainers.cgmanager0_0", NULL);
-    const DbusTestDbusMockCall* calls = NULL;
-    guint len = 0;
-
-    /* Click in the set */
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
-    EXPECT_TRUE(app->instances()[0]->hasPid(100));
-    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
-    ASSERT_EQ(1u, len);
-    EXPECT_STREQ("GetTasksRecursive", calls->name);
-    EXPECT_TRUE(g_variant_equal(
-        calls->params, g_variant_new("(ss)", "freezer", "upstart/application-click-com.test.good_application_1.2.3")));
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
-
-    /* Click out of the set */
-    EXPECT_FALSE(app->instances()[0]->hasPid(101));
-    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
-    ASSERT_EQ(1u, len);
-    EXPECT_STREQ("GetTasksRecursive", calls->name);
-    EXPECT_TRUE(g_variant_equal(
-        calls->params, g_variant_new("(ss)", "freezer", "upstart/application-click-com.test.good_application_1.2.3")));
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
-
     /* Legacy Single Instance */
     auto singleappid = ubuntu::app_launch::AppID::find(registry, "single");
     auto singleapp = ubuntu::app_launch::Application::create(singleappid, registry);
 
     ASSERT_LT(0, int(singleapp->instances().size()));
-    EXPECT_TRUE(singleapp->instances()[0]->hasPid(100));
-
-    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
-    ASSERT_EQ(1u, len);
-    EXPECT_STREQ("GetTasksRecursive", calls->name);
-    EXPECT_TRUE(g_variant_equal(calls->params, g_variant_new("(ss)", "freezer", "upstart/application-legacy-single-")));
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
-
-    /* Legacy Multi Instance */
-    EXPECT_TRUE(multiapp->instances()[0]->hasPid(100));
-    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
-    ASSERT_EQ(1u, len);
-    EXPECT_STREQ("GetTasksRecursive", calls->name);
-    EXPECT_TRUE(g_variant_equal(calls->params,
-                                g_variant_new("(ss)", "freezer", "upstart/application-legacy-multiple-2342345")));
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
+    EXPECT_TRUE(singleapp->instances()[0]->hasPid(getpid()));
 }
 
 TEST_F(LibUAL, ApplicationId)
 {
-    g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
-    g_setenv("TEST_CLICK_USER", "test-user", TRUE);
+    auto mockstore = std::make_shared<MockStore>();
+    registry =
+        std::make_shared<RegistryMock>(std::list<std::shared_ptr<ubuntu::app_launch::app_store::Base>>{mockstore});
+
+    EXPECT_CALL(*mockstore, verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, verifyAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                          ubuntu::app_launch::AppID::AppName::from_raw("application"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, findVersion(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                        ubuntu::app_launch::AppID::AppName::from_raw("application"), testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::Version::from_raw("1.2.3")));
 
     /* Test with current-user-version, should return the version in the manifest */
     EXPECT_EQ("com.test.good_application_1.2.3",
               (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.good", "application"));
 
+    EXPECT_CALL(*mockstore, verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, verifyAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                          ubuntu::app_launch::AppID::AppName::from_raw("application"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore,
+                hasAppId(ubuntu::app_launch::AppID{ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                                   ubuntu::app_launch::AppID::AppName::from_raw("application"),
+                                                   ubuntu::app_launch::AppID::Version::from_raw("1.2.4")},
+                         testing::_))
+        .WillOnce(testing::Return(true));
+
     /* Test with version specified, shouldn't even read the manifest */
     EXPECT_EQ("com.test.good_application_1.2.4",
               (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.good", "application", "1.2.4"));
 
+    EXPECT_CALL(*mockstore, verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, findAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                        ubuntu::app_launch::AppID::ApplicationWildcard::FIRST_LISTED, testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::AppName::from_raw("application")));
+    EXPECT_CALL(*mockstore, findVersion(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                        ubuntu::app_launch::AppID::AppName::from_raw("application"), testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::Version::from_raw("1.2.3")));
+
     /* Test with out a version or app, should return the version in the manifest */
     EXPECT_EQ("com.test.good_application_1.2.3",
               (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.good", "first-listed-app",
                                                                "current-user-version"));
 
     /* Make sure we can select the app from a list correctly */
+    EXPECT_CALL(*mockstore,
+                verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, findAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"),
+                                        ubuntu::app_launch::AppID::ApplicationWildcard::FIRST_LISTED, testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::AppName::from_raw("first")));
+    EXPECT_CALL(*mockstore, findVersion(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"),
+                                        ubuntu::app_launch::AppID::AppName::from_raw("first"), testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::Version::from_raw("1.2.3")));
     EXPECT_EQ("com.test.multiple_first_1.2.3",
               (std::string)ubuntu::app_launch::AppID::discover(
                   registry, "com.test.multiple", ubuntu::app_launch::AppID::ApplicationWildcard::FIRST_LISTED));
+
+    EXPECT_CALL(*mockstore,
+                verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, findAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"),
+                                        ubuntu::app_launch::AppID::ApplicationWildcard::FIRST_LISTED, testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::AppName::from_raw("first")));
+    EXPECT_CALL(*mockstore, findVersion(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"),
+                                        ubuntu::app_launch::AppID::AppName::from_raw("first"), testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::Version::from_raw("1.2.3")));
     EXPECT_EQ("com.test.multiple_first_1.2.3",
               (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.multiple"));
+
+    EXPECT_CALL(*mockstore,
+                verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, findAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"),
+                                        ubuntu::app_launch::AppID::ApplicationWildcard::LAST_LISTED, testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::AppName::from_raw("fifth")));
+    EXPECT_CALL(*mockstore, findVersion(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"),
+                                        ubuntu::app_launch::AppID::AppName::from_raw("fifth"), testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::Version::from_raw("1.2.3")));
     EXPECT_EQ("com.test.multiple_fifth_1.2.3",
               (std::string)ubuntu::app_launch::AppID::discover(
                   registry, "com.test.multiple", ubuntu::app_launch::AppID::ApplicationWildcard::LAST_LISTED));
+
+    EXPECT_CALL(*mockstore,
+                verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, findAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.multiple"),
+                                        ubuntu::app_launch::AppID::ApplicationWildcard::ONLY_LISTED, testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::AppName::from_raw("")));
     EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(
                       registry, "com.test.multiple", ubuntu::app_launch::AppID::ApplicationWildcard::ONLY_LISTED));
+
+    EXPECT_CALL(*mockstore, verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"), testing::_))
+        .WillOnce(testing::Return(true));
+    EXPECT_CALL(*mockstore, findAppname(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                        ubuntu::app_launch::AppID::ApplicationWildcard::ONLY_LISTED, testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::AppName::from_raw("application")));
+    EXPECT_CALL(*mockstore, findVersion(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
+                                        ubuntu::app_launch::AppID::AppName::from_raw("application"), testing::_))
+        .WillOnce(testing::Return(ubuntu::app_launch::AppID::Version::from_raw("1.2.3")));
     EXPECT_EQ("com.test.good_application_1.2.3",
               (std::string)ubuntu::app_launch::AppID::discover(
                   registry, "com.test.good", ubuntu::app_launch::AppID::ApplicationWildcard::ONLY_LISTED));
 
     /* A bunch that should be NULL */
+    EXPECT_CALL(*mockstore,
+                verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.no-hooks"), testing::_))
+        .WillOnce(testing::Return(false));
     EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.no-hooks"));
+    EXPECT_CALL(*mockstore, verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.no-json"), testing::_))
+        .WillOnce(testing::Return(false));
     EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.no-json"));
+    EXPECT_CALL(*mockstore,
+                verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.no-object"), testing::_))
+        .WillOnce(testing::Return(false));
     EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.no-object"));
+    EXPECT_CALL(*mockstore,
+                verifyPackage(ubuntu::app_launch::AppID::Package::from_raw("com.test.no-version"), testing::_))
+        .WillOnce(testing::Return(false));
     EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(registry, "com.test.no-version"));
+}
 
+TEST_F(LibUAL, ApplicationIdLibertine)
+{
     /* Libertine tests */
     EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(registry, "container-name"));
     EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(registry, "container-name", "not-exist"));
@@ -492,9 +574,7 @@
 TEST_F(LibUAL, AppIdParse)
 {
     EXPECT_FALSE(ubuntu::app_launch::AppID::parse("com.ubuntu.test_test_123").empty());
-    EXPECT_FALSE(ubuntu::app_launch::AppID::find(registry, "inkscape").empty());
     EXPECT_FALSE(ubuntu::app_launch::AppID::parse("chatter.robert-ancell_chatter_2").empty());
-    EXPECT_FALSE(ubuntu::app_launch::AppID::find(registry, "chatter.robert-ancell_chatter").empty());
 
     auto id = ubuntu::app_launch::AppID::parse("com.ubuntu.test_test_123");
 
@@ -508,18 +588,12 @@
 
 TEST_F(LibUAL, ApplicationList)
 {
-#ifdef ENABLE_SNAPPY
     SnapdMock snapd{LOCAL_SNAPD_TEST_SOCKET, {u8Package, interfaces, u8Package}};
     registry = std::make_shared<ubuntu::app_launch::Registry>();
-#endif
 
     auto apps = ubuntu::app_launch::Registry::runningApps(registry);
 
-#ifdef ENABLE_SNAPPY
-    ASSERT_EQ(4, int(apps.size()));
-#else
-    ASSERT_EQ(3, int(apps.size()));
-#endif
+    ASSERT_EQ(3u, apps.size());
 
     apps.sort([](const std::shared_ptr<ubuntu::app_launch::Application>& a,
                  const std::shared_ptr<ubuntu::app_launch::Application>& b) {
@@ -529,10 +603,8 @@
         return sa < sb;
     });
 
-    EXPECT_EQ("com.test.good_application_1.2.3", (std::string)apps.front()->appId());
-#ifdef ENABLE_SNAPPY
+    EXPECT_EQ("multiple", (std::string)apps.front()->appId());
     EXPECT_EQ("unity8-package_foo_x123", (std::string)apps.back()->appId());
-#endif
 }
 
 TEST_F(LibUAL, StartingResponses)
@@ -559,17 +631,17 @@
 
     /* Emit a signal */
     g_dbus_connection_emit_signal(
-        session, NULL,                                                            /* destination */
-        "/",                                                                      /* path */
-        "com.canonical.UbuntuAppLaunch",                                          /* interface */
-        "UnityStartingBroadcast",                                                 /* signal */
-        g_variant_new("(ss)", "com.test.good_application_1.2.3", "goodinstance"), /* params, the same */
+        session, NULL,                                                    /* destination */
+        "/",                                                              /* path */
+        "com.canonical.UbuntuAppLaunch",                                  /* interface */
+        "UnityStartingBroadcast",                                         /* signal */
+        g_variant_new("(ss)", "container-name_test_0.0", "goodinstance"), /* params, the same */
         NULL);
 
     /* Make sure we run our observer */
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID(ubuntu::app_launch::AppID::Package::from_raw("com.test.good"),
-                                                   ubuntu::app_launch::AppID::AppName::from_raw("application"),
-                                                   ubuntu::app_launch::AppID::Version::from_raw("1.2.3")),
+    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID(ubuntu::app_launch::AppID::Package::from_raw("container-name"),
+                                                   ubuntu::app_launch::AppID::AppName::from_raw("test"),
+                                                   ubuntu::app_launch::AppID::Version::from_raw("0.0")),
                          manager->lastStartedApp);
 
     /* Make sure we return */
@@ -581,119 +653,57 @@
 
 TEST_F(LibUAL, AppIdTest)
 {
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto appid = ubuntu::app_launch::AppID::find(registry, "single");
     auto app = ubuntu::app_launch::Application::create(appid, registry);
     app->launch();
 
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastFocusedApp);
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastResumedApp);
-}
-
-GDBusMessage* filter_func_good(GDBusConnection* conn, GDBusMessage* message, gboolean incomming, gpointer user_data)
-{
-    if (!incomming)
-    {
-        return message;
-    }
-
-    if (g_strcmp0(g_dbus_message_get_path(message), (gchar*)user_data) == 0)
-    {
-        GDBusMessage* reply = g_dbus_message_new_method_reply(message);
-        g_dbus_connection_send_message(conn, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-        g_object_unref(message);
-        return NULL;
-    }
-
-    return message;
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastFocusedApp);
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastResumedApp);
 }
 
 TEST_F(LibUAL, UrlSendTest)
 {
-    GDBusConnection* session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-    guint filter = g_dbus_connection_add_filter(session, filter_func_good,
-                                                (gpointer) "/com_2etest_2egood_5fapplication_5f1_2e2_2e3", NULL);
-
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
-    auto app = ubuntu::app_launch::Application::create(appid, registry);
-    std::vector<ubuntu::app_launch::Application::URL> uris = {
-        ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
-
-    app->launch(uris);
-
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastFocusedApp);
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastResumedApp);
-
-    g_dbus_connection_remove_filter(session, filter);
-
-    /* Send multiple resume responses to ensure we unsubscribe */
-    /* Multiple to increase our chance of hitting a bad free in the middle,
-       fun with async! */
-    int i;
-    for (i = 0; i < 5; i++)
-    {
-        g_dbus_connection_emit_signal(
-            session, NULL,                                                            /* destination */
-            "/",                                                                      /* path */
-            "com.canonical.UbuntuAppLaunch",                                          /* interface */
-            "UnityResumeResponse",                                                    /* signal */
-            g_variant_new("(ss)", "com.test.good_application_1.2.3", "goodinstance"), /* params, the same */
-            NULL);
-
-        pause(50); /* Ensure all the events come through */
-    }
-
-    g_object_unref(session);
-}
-
-TEST_F(LibUAL, UrlSendNoObjectTest)
-{
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
-    auto app = ubuntu::app_launch::Application::create(appid, registry);
-    std::vector<ubuntu::app_launch::Application::URL> uris = {
-        ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
-
-    app->launch(uris);
-
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastFocusedApp);
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastResumedApp);
+    auto appid = ubuntu::app_launch::AppID::find(registry, "foo");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    std::vector<ubuntu::app_launch::Application::URL> uris = {
+        ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
+
+    app->launch(uris);
+
+    std::list<SystemdMock::TransientUnit> calls;
+    ASSERT_EVENTUALLY_FUNC_LT(0u, std::function<unsigned int(void)>([&]() {
+                                  calls = systemd->unitCalls();
+                                  return calls.size();
+                              }));
+    EXPECT_EQ("http://www.test.com", *calls.begin()->execline.rbegin());
 }
 
 TEST_F(LibUAL, UnityTimeoutTest)
 {
     this->resume_timeout = 100;
 
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto appid = ubuntu::app_launch::AppID::find(registry, "single");
     auto app = ubuntu::app_launch::Application::create(appid, registry);
 
     app->launch();
 
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastResumedApp);
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastFocusedApp);
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastResumedApp);
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastFocusedApp);
 }
 
 TEST_F(LibUAL, UnityTimeoutUriTest)
 {
     this->resume_timeout = 200;
 
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto appid = ubuntu::app_launch::AppID::find(registry, "single");
     auto app = ubuntu::app_launch::Application::create(appid, registry);
     std::vector<ubuntu::app_launch::Application::URL> uris = {
         ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
 
     app->launch(uris);
 
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastFocusedApp);
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastResumedApp);
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastFocusedApp);
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastResumedApp);
 }
 
 GDBusMessage* filter_respawn(GDBusConnection* conn, GDBusMessage* message, gboolean incomming, gpointer user_data)
@@ -714,7 +724,7 @@
 
     guint start = g_get_monotonic_time();
 
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto appid = ubuntu::app_launch::AppID::find(registry, "single");
     auto app = ubuntu::app_launch::Application::create(appid, registry);
     std::vector<ubuntu::app_launch::Application::URL> uris = {
         ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
@@ -726,10 +736,8 @@
     g_debug("Start call time: %d ms", (end - start) / 1000);
     EXPECT_LT(end - start, guint(2000 * 1000));
 
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastFocusedApp);
-    EXPECT_EVENTUALLY_EQ(ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3"),
-                         this->manager->lastResumedApp);
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastFocusedApp);
+    EXPECT_EVENTUALLY_EQ(appid, this->manager->lastResumedApp);
 
     g_dbus_connection_remove_filter(session, filter);
     g_object_unref(session);
@@ -768,10 +776,12 @@
 
 TEST_F(LibUAL, StartHelper)
 {
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.multiple_first_1.2.3");
     auto untrusted = ubuntu::app_launch::Helper::Type::from_raw("untrusted-type");
 
+    storeForHelper(appid);
+
     /* Basic make sure we can send the event */
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.multiple_first_1.2.3");
     auto helper = ubuntu::app_launch::Helper::create(untrusted, appid, registry);
 
     auto inst = helper->launch();
@@ -782,7 +792,7 @@
     EXPECT_EQ(SystemdMock::instanceName(
                   {"untrusted-type",
                    "com.test.multiple_first_1.2.3",
-                   std::dynamic_pointer_cast<ubuntu::app_launch::jobs::instance::Base>(inst)->getInstanceId(),
+                   std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::BaseInstance>(inst)->getInstanceId(),
                    0,
                    {}}),
               helperStart.begin()->name);
@@ -798,7 +808,7 @@
     EXPECT_EQ(SystemdMock::instanceName(
                   {"untrusted-type",
                    "com.test.multiple_first_1.2.3",
-                   std::dynamic_pointer_cast<ubuntu::app_launch::jobs::instance::Base>(inst2)->getInstanceId(),
+                   std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::BaseInstance>(inst2)->getInstanceId(),
                    0,
                    {}}),
               helperStart2.begin()->name);
@@ -819,7 +829,7 @@
     EXPECT_EQ(SystemdMock::instanceName(
                   {"untrusted-type",
                    "com.test.multiple_first_1.2.3",
-                   std::dynamic_pointer_cast<ubuntu::app_launch::jobs::instance::Base>(inst3)->getInstanceId(),
+                   std::dynamic_pointer_cast<ubuntu::app_launch::helper_impls::BaseInstance>(inst3)->getInstanceId(),
                    0,
                    {}}),
               helperStart3.begin()->name);
@@ -832,7 +842,7 @@
 TEST_F(LibUAL, StopHelper)
 {
     /* Multi helper */
-    auto untrusted = ubuntu::app_launch::Helper::Type::from_raw("untrusted-type");
+    auto untrusted = ubuntu::app_launch::Helper::Type::from_raw("untrusted-helper");
 
     auto appid = ubuntu::app_launch::AppID::parse("com.bar_foo_8432.13.1");
     auto helper = ubuntu::app_launch::Helper::create(untrusted, appid, registry);
@@ -849,7 +859,7 @@
 
     ASSERT_EQ(1u, calls.size());
 
-    EXPECT_EQ(SystemdMock::instanceName({"untrusted-type", "com.bar_foo_8432.13.1", "24034582324132", 0, {}}),
+    EXPECT_EQ(SystemdMock::instanceName({"untrusted-helper", "com.bar_foo_8432.13.1", "24034582324132", 0, {}}),
               *calls.begin());
 
     return;
@@ -862,7 +872,7 @@
 
     EXPECT_EQ(0, int(notlist.size()));
 
-    auto goodhelper = ubuntu::app_launch::Helper::Type::from_raw("untrusted-type");
+    auto goodhelper = ubuntu::app_launch::Helper::Type::from_raw("untrusted-helper");
     auto goodlist = ubuntu::app_launch::Registry::runningHelpers(goodhelper, registry);
 
     ASSERT_EQ(2, int(goodlist.size()));
@@ -888,49 +898,48 @@
     EXPECT_TRUE(goodlist.back()->instances()[0]->isRunning());
 }
 
-typedef struct
-{
-    int count;
-    const gchar* appid;
-    const gchar* type;
-    const gchar* instance;
-} helper_observer_data_t;
-
-static void helper_observer_cb(const gchar* appid, const gchar* instance, const gchar* type, gpointer user_data)
-{
-    helper_observer_data_t* data = (helper_observer_data_t*)user_data;
-
-    if (g_strcmp0(data->appid, appid) == 0 && g_strcmp0(data->type, type) == 0 &&
-        g_strcmp0(data->instance, instance) == 0)
-    {
-        data->count++;
-    }
-}
-
 TEST_F(LibUAL, StartStopHelperObserver)
 {
-    helper_observer_data_t start_data = {
-        .count = 0, .appid = "com.foo_foo_1.2.3", .type = "my-type-is-scorpio", .instance = nullptr};
-    helper_observer_data_t stop_data = {
-        .count = 0, .appid = "com.bar_bar_44.32", .type = "my-type-is-libra", .instance = "1234"};
-
-    ASSERT_TRUE(ubuntu_app_launch_observer_add_helper_started(helper_observer_cb, "my-type-is-scorpio", &start_data));
-    ASSERT_TRUE(ubuntu_app_launch_observer_add_helper_stop(helper_observer_cb, "my-type-is-libra", &stop_data));
+    auto type = ubuntu::app_launch::Helper::Type::from_raw("my-type-is-scorpio");
+    auto appid = ubuntu::app_launch::AppID::parse("com.foo_foo_1.2.3");
+
+    storeForHelper(appid);
+
+    int start_count = 0;
+    int stop_count = 0;
+
+    ubuntu::app_launch::Registry::helperStarted(type, registry)
+        .connect([&](const std::shared_ptr<ubuntu::app_launch::Helper>& helper,
+                     const std::shared_ptr<ubuntu::app_launch::Helper::Instance>& inst) {
+            if (helper->appId() != appid)
+            {
+                return;
+            }
+
+            start_count++;
+        });
+    ubuntu::app_launch::Registry::helperStopped(type, registry)
+        .connect([&](const std::shared_ptr<ubuntu::app_launch::Helper>& helper,
+                     const std::shared_ptr<ubuntu::app_launch::Helper::Instance>& inst) {
+            if (helper->appId() != appid)
+            {
+                return;
+            }
+
+            stop_count++;
+        });
 
     /* Basic start */
-    systemd->managerEmitNew(SystemdMock::instanceName({"my-type-is-scorpio", "com.foo_foo_1.2.3", "", 0, {}}), "/");
+    systemd->managerEmitNew(SystemdMock::instanceName({"my-type-is-scorpio", "com.foo_foo_1.2.3", "1234", 0, {}}),
+                            "/foo");
 
-    EXPECT_EVENTUALLY_EQ(1, start_data.count);
+    EXPECT_EVENTUALLY_EQ(1, start_count);
 
     /* Basic stop */
-    systemd->managerEmitRemoved(SystemdMock::instanceName({"my-type-is-scorpio", "com.foo_foo_1.2.3", "", 0, {}}), "/");
-
-    EXPECT_EVENTUALLY_EQ(1, stop_data.count);
-
-    /* Remove */
-    ASSERT_TRUE(
-        ubuntu_app_launch_observer_delete_helper_started(helper_observer_cb, "my-type-is-scorpio", &start_data));
-    ASSERT_TRUE(ubuntu_app_launch_observer_delete_helper_stop(helper_observer_cb, "my-type-is-libra", &stop_data));
+    systemd->managerEmitRemoved(SystemdMock::instanceName({"my-type-is-scorpio", "com.foo_foo_1.2.3", "1234", 0, {}}),
+                                "/foo");
+
+    EXPECT_EVENTUALLY_EQ(1, stop_count);
 }
 
 // DISABLED: Skipping these tests to not block on bug #1584849
@@ -946,7 +955,10 @@
 
     /* New Systemd Mock */
     dbus_test_service_remove_task(service, *systemd);
+    kill(dbus_test_process_get_pid(*systemd), SIGTERM);
+    EXPECT_EVENTUALLY_FUNC_EQ(DBUS_TEST_TASK_STATE_FINISHED, systemd->stateFunc());
     systemd.reset();
+
     auto systemd2 = std::make_shared<SystemdMock>(
         std::list<SystemdMock::Instance>{
             {"application-click", "com.test.good_application_1.2.3", {}, spew.pid(), {spew.pid()}}},
@@ -1032,6 +1044,7 @@
 
 TEST_F(LibUAL, MultiPause)
 {
+    auto appid = ubuntu::app_launch::AppID::find(registry, "single");
     g_setenv("UBUNTU_APP_LAUNCH_OOM_PROC_PATH", CMAKE_BINARY_DIR "/libual-proc", 1);
 
     /* Setup A TON OF spew */
@@ -1042,18 +1055,32 @@
 
     /* New Systemd Mock */
     dbus_test_service_remove_task(service, *systemd);
+    kill(dbus_test_process_get_pid(*systemd), SIGTERM);
+    EXPECT_EVENTUALLY_FUNC_EQ(DBUS_TEST_TASK_STATE_FINISHED, systemd->stateFunc());
     systemd.reset();
-    std::vector<pid_t> spewpids;
-    std::transform(spews.begin(), spews.end(), spewpids.begin(), [](SpewMaster& spew) { return spew.pid(); });
+
+    std::vector<pid_t> spewpids{int(spews.size())};
+    for (const auto& spew : spews)
+    {
+        spewpids.push_back(spew.pid());
+    }
     auto systemd2 = std::make_shared<SystemdMock>(
-        std::list<SystemdMock::Instance>{
-            {"application-click", "com.test.good_application_1.2.3", {}, spews.begin()->pid(), spewpids}},
+        std::list<SystemdMock::Instance>{{"application-legacy", "single", {}, spews.begin()->pid(), spewpids}},
         CGROUP_DIR);
 
+    /* Add mocks */
+    dbus_test_service_add_task(service, *systemd2);
+    dbus_test_service_add_task(service, *zgmock);
+    dbus_test_task_run(*systemd2);
+    dbus_test_task_run(*zgmock);
+
     /* Give things a chance to start */
     EXPECT_EVENTUALLY_FUNC_EQ(DBUS_TEST_TASK_STATE_RUNNING, systemd2->stateFunc());
     EXPECT_EVENTUALLY_FUNC_EQ(DBUS_TEST_TASK_STATE_RUNNING, zgmock->stateFunc());
 
+    /* Resetup the registry with the new systemd */
+    registry = std::make_shared<ubuntu::app_launch::Registry>();
+
     /* Setup signal handling */
     guint paused_count = 0;
     guint resumed_count = 0;
@@ -1078,10 +1105,10 @@
     });
 
     /* Get our app object */
-    auto appid = ubuntu::app_launch::AppID::find(registry, "com.test.good_application_1.2.3");
     auto app = ubuntu::app_launch::Application::create(appid, registry);
 
-    ASSERT_EQ(1, int(app->instances().size()));
+    ASSERT_NE(nullptr, app);
+    ASSERT_EQ(1u, app->instances().size());
 
     auto instance = app->instances()[0];
 
@@ -1150,10 +1177,10 @@
     ASSERT_TRUE(g_file_set_contents(oomadjfile, "0", -1, NULL));
 
     /* Get our app object */
-    auto appid = ubuntu::app_launch::AppID::find(registry, "com.test.good_application_1.2.3");
+    auto appid = ubuntu::app_launch::AppID::find(registry, "single");
     auto app = ubuntu::app_launch::Application::create(appid, registry);
 
-    ASSERT_EQ(1, int(app->instances().size()));
+    ASSERT_EQ(1u, app->instances().size());
 
     auto instance = app->instances()[0];
 
@@ -1270,76 +1297,99 @@
     return;
 }
 
-#if 0
-/* Need to change as helpers change to not use Upstart features */
+/* Hardcore socket stuff */
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/un.h>
+
 TEST_F(LibUAL, SetExec)
 {
-    DbusTestDbusMockObject* obj =
-        dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
-
-    const char* exec = "lets exec this";
-
-    g_setenv("UPSTART_JOB", "fubar", TRUE);
-    g_unsetenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
-    EXPECT_TRUE(ubuntu_app_launch_helper_set_exec(exec, NULL));
-
-    guint len = 0;
-    const DbusTestDbusMockCall* calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
-    ASSERT_NE(nullptr, calls);
-    ASSERT_EQ(1u, len);
-
-    gchar* appexecstr = g_strdup_printf("APP_EXEC=%s", exec);
-    GVariant* appexecenv = g_variant_get_child_value(calls[0].params, 1);
-    EXPECT_STREQ(appexecstr, g_variant_get_string(appexecenv, nullptr));
-    g_variant_unref(appexecenv);
-    g_free(appexecstr);
-
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
-
-    /* Now check for the demangler */
-    g_setenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME", g_dbus_connection_get_unique_name(bus), TRUE);
-    EXPECT_TRUE(ubuntu_app_launch_helper_set_exec(exec, NULL));
-
-    calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
-    ASSERT_NE(nullptr, calls);
-    ASSERT_EQ(1u, len);
-
-    gchar* demangleexecstr = g_strdup_printf("APP_EXEC=%s %s", SOCKET_DEMANGLER_INSTALL, exec);
-    appexecenv = g_variant_get_child_value(calls[0].params, 1);
-    EXPECT_STREQ(demangleexecstr, g_variant_get_string(appexecenv, nullptr));
-    g_variant_unref(appexecenv);
-    g_free(demangleexecstr);
-
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
-
-    /* Now check for the directory */
-    g_setenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME", g_dbus_connection_get_unique_name(bus), TRUE);
-    EXPECT_TRUE(ubuntu_app_launch_helper_set_exec(exec, "/not/a/real/directory"));
-
-    calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
-    ASSERT_NE(nullptr, calls);
-    EXPECT_EQ(2u, len);
-
-    appexecenv = g_variant_get_child_value(calls[1].params, 1);
-    EXPECT_STREQ("APP_DIR=/not/a/real/directory", g_variant_get_string(appexecenv, nullptr));
-    g_variant_unref(appexecenv);
-
-    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+    /* Create a socket */
+    class SmartSocket
+    {
+    public:
+        int fd;
+        SmartSocket()
+            : fd(socket(AF_UNIX, SOCK_STREAM, 0))
+        {
+        }
+        ~SmartSocket()
+        {
+            close(fd);
+        }
+    };
+    SmartSocket sock;
+    ASSERT_NE(0, sock.fd);
+
+    std::string socketname{"/ual-setexec-test-12445343"};
+
+    struct sockaddr_un socketaddr = {0};
+    socketaddr.sun_family = AF_UNIX;
+    strncpy(socketaddr.sun_path, socketname.c_str(), sizeof(socketaddr.sun_path) - 1);
+    socketaddr.sun_path[0] = 0;
+
+    ASSERT_EQ(0, bind(sock.fd, (const struct sockaddr*)&socketaddr, sizeof(struct sockaddr_un)));
+    listen(sock.fd, 1); /* 1 is the number of people who can connect */
+
+    setenv("UBUNTU_APP_LAUNCH_HELPER_EXECTOOL_SETEXEC_SOCKET", socketname.c_str(), 1);
+
+    std::promise<std::vector<std::string>> socketpromise;
+    std::thread socketreader([&]() {
+        std::vector<std::string> socketvals;
+
+        int readsocket = accept(sock.fd, NULL, NULL);
+
+        /* Keeping this similar to the helper-helper code as that's what
+         * we're running against. Not making it C++-style. */
+        char readbuf[2048] = {0};
+        int thisread = 0;
+        int amountread = 0;
+        while ((thisread = read(readsocket, readbuf + amountread, 2048 - amountread)) > 0)
+        {
+            amountread += thisread;
+
+            if (amountread == 2048)
+            {
+                try
+                {
+                    throw std::runtime_error{"Read too many bytes from socket"};
+                }
+                catch (...)
+                {
+                    socketpromise.set_exception(std::current_exception());
+                }
+                return;
+            }
+        }
+
+        close(readsocket);
+
+        /* Parse data */
+        if (amountread > 0)
+        {
+            char* startvar = readbuf;
+
+            do
+            {
+                socketvals.emplace_back(std::string(startvar));
+
+                startvar = startvar + strlen(startvar) + 1;
+            } while (startvar < readbuf + amountread);
+        }
+
+        /* Read socket */
+        socketpromise.set_value(socketvals);
+    });
+    socketreader.detach(); /* avoid thread cleanup code when we don't really care */
+
+    std::vector<std::string> execList{"Foo", "Bar", "Really really really long value", "Another value"};
+    ubuntu::app_launch::Helper::setExec(execList);
+
+    EXPECT_EQ(execList, socketpromise.get_future().get());
 }
-#endif
 
 TEST_F(LibUAL, AppInfo)
 {
-    g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
-    g_setenv("TEST_CLICK_USER", "test-user", TRUE);
-
-    /* Correct values from a click */
-    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.4");
-    auto app = ubuntu::app_launch::Application::create(appid, registry);
-
-    EXPECT_TRUE((bool)app->info());
-    EXPECT_EQ("Application", app->info()->name().value());
-
     /* Correct values from a legacy */
     auto barid = ubuntu::app_launch::AppID::find(registry, "bar");
     EXPECT_THROW(ubuntu::app_launch::Application::create(barid, registry), std::runtime_error);

=== modified file 'tests/libual-test.cc'
--- tests/libual-test.cc	2017-02-15 15:10:07 +0000
+++ tests/libual-test.cc	2017-03-21 03:26:40 +0000
@@ -20,6 +20,7 @@
 #include <fcntl.h>
 #include <future>
 #include <gio/gio.h>
+#include <glib/gstdio.h>
 #include <gtest/gtest.h>
 #include <libdbustest/dbus-test.h>
 #include <thread>
@@ -30,340 +31,164 @@
 #include "registry.h"
 #include "ubuntu-app-launch.h"
 
+#include "eventually-fixture.h"
 #include "libertine-service.h"
-#include "eventually-fixture.h"
 #include "mir-mock.h"
+#include "snapd-mock.h"
+#include "systemd-mock.h"
+
+#define LOCAL_SNAPD_TEST_SOCKET (SNAPD_TEST_SOCKET "-libual-test")
+#define CGROUP_DIR (CMAKE_BINARY_DIR "/systemd-libual-cgroups")
 
 class LibUAL : public EventuallyFixture
 {
-	protected:
-		DbusTestService * service = NULL;
-		DbusTestDbusMock * mock = NULL;
-		DbusTestDbusMock * cgmock = NULL;
-		std::shared_ptr<LibertineService> libertine;
-		GDBusConnection * bus = NULL;
-		std::string last_focus_appid;
-		std::string last_resume_appid;
-		guint resume_timeout = 0;
-
-	private:
-		static void focus_cb (const gchar * appid, gpointer user_data) {
-			g_debug("Focus Callback: %s", appid);
-			LibUAL * _this = static_cast<LibUAL *>(user_data);
-			_this->last_focus_appid = appid;
-		}
-
-		static void resume_cb (const gchar * appid, gpointer user_data) {
-			g_debug("Resume Callback: %s", appid);
-			LibUAL * _this = static_cast<LibUAL *>(user_data);
-			_this->last_resume_appid = appid;
-
-			if (_this->resume_timeout > 0) {
-				_this->pause(_this->resume_timeout);
-			}
-		}
-
-	protected:
-		/* Useful debugging stuff, but not on by default.  You really want to
-		   not get all this noise typically */
-		void debugConnection() {
-			if (true) return;
-
-			DbusTestBustle * bustle = dbus_test_bustle_new("test.bustle");
-			dbus_test_service_add_task(service, DBUS_TEST_TASK(bustle));
-			g_object_unref(bustle);
-
-			DbusTestProcess * monitor = dbus_test_process_new("dbus-monitor");
-			dbus_test_service_add_task(service, DBUS_TEST_TASK(monitor));
-			g_object_unref(monitor);
-		}
-
-		virtual void SetUp() {
-			/* Click DB test mode */
-			g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
-			g_setenv("TEST_CLICK_USER", "test-user", TRUE);
-
-			gchar * linkfarmpath = g_build_filename(CMAKE_SOURCE_DIR, "link-farm", NULL);
-			g_setenv("UBUNTU_APP_LAUNCH_LINK_FARM", linkfarmpath, TRUE);
-			g_free(linkfarmpath);
-
-			g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE);
-			g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE);
-			g_setenv("XDG_DATA_HOME",  CMAKE_SOURCE_DIR "/libertine-home", TRUE);
-
-			g_setenv("UBUNTU_APP_LAUNCH_SNAPD_SOCKET", "/this/should/not/exist", TRUE);
-			g_setenv("UBUNTU_APP_LAUNCH_SYSTEMD_PATH", "/this/should/not/exist", TRUE);
-
-			service = dbus_test_service_new(NULL);
-
-			debugConnection();
-
-			mock = dbus_test_dbus_mock_new("com.ubuntu.Upstart");
-
-			DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, obj,
-				"EmitEvent",
-				G_VARIANT_TYPE("(sasb)"),
-				NULL,
-				"",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, obj,
-				"GetJobByName",
-				G_VARIANT_TYPE("s"),
-				G_VARIANT_TYPE("o"),
-				"if args[0] == 'application-click':\n"
-				"	ret = dbus.ObjectPath('/com/test/application_click')\n"
-				"elif args[0] == 'application-legacy':\n"
-				"	ret = dbus.ObjectPath('/com/test/application_legacy')\n"
-				"elif args[0] == 'untrusted-helper':\n"
-				"	ret = dbus.ObjectPath('/com/test/untrusted/helper')\n",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, obj,
-				"SetEnv",
-				G_VARIANT_TYPE("(assb)"),
-				NULL,
-				"",
-				NULL);
-
-			/* Click App */
-			DbusTestDbusMockObject * jobobj = dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, jobobj,
-				"Start",
-				G_VARIANT_TYPE("(asb)"),
-				NULL,
-				"if 'APP_ID=com.test.good_application_1.2.3' in args[0]:"
-				"    raise dbus.exceptions.DBusException('Foo running', name='com.ubuntu.Upstart0_6.Error.AlreadyStarted')",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, jobobj,
-				"Stop",
-				G_VARIANT_TYPE("(asb)"),
-				NULL,
-				"",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, jobobj,
-				"GetAllInstances",
-				NULL,
-				G_VARIANT_TYPE("ao"),
-				"ret = [ dbus.ObjectPath('/com/test/app_instance') ]",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock,
-				jobobj,
-				"GetInstanceByName",
-				G_VARIANT_TYPE_STRING,
-				G_VARIANT_TYPE("o"),
-				"ret = dbus.ObjectPath('/com/test/app_instance')",
-				NULL);
-
-			DbusTestDbusMockObject * instobj = dbus_test_dbus_mock_get_object(mock, "/com/test/app_instance", "com.ubuntu.Upstart0_6.Instance", NULL);
-			dbus_test_dbus_mock_object_add_property(mock, instobj,
-				"name",
-				G_VARIANT_TYPE_STRING,
-				g_variant_new_string("com.test.good_application_1.2.3"),
-				NULL);
-			gchar * process_var = g_strdup_printf("[('main', %d)]", getpid());
-			dbus_test_dbus_mock_object_add_property(mock, instobj,
-				"processes",
-				G_VARIANT_TYPE("a(si)"),
-				g_variant_new_parsed(process_var),
-				NULL);
-			g_free(process_var);
-
-			/*  Legacy App */
-			DbusTestDbusMockObject * ljobobj = dbus_test_dbus_mock_get_object(mock, "/com/test/application_legacy", "com.ubuntu.Upstart0_6.Job", NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, ljobobj,
-				"Start",
-				G_VARIANT_TYPE("(asb)"),
-				NULL,
-				"",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, ljobobj,
-				"Stop",
-				G_VARIANT_TYPE("(asb)"),
-				NULL,
-				"",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, ljobobj,
-				"GetAllInstances",
-				NULL,
-				G_VARIANT_TYPE("ao"),
-				"ret = [ dbus.ObjectPath('/com/test/legacy_app_instance'), dbus.ObjectPath('/com/test/legacy_app_instance2')]",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock,
-				ljobobj,
-				"GetInstanceByName",
-				G_VARIANT_TYPE_STRING,
-				G_VARIANT_TYPE("o"),
-				"if args[0] == 'multiple-2342345':\n"
-				"  ret = dbus.ObjectPath('/com/test/legacy_app_instance')\n"
-				"elif args[0] == 'single-':\n"
-				"  ret = dbus.ObjectPath('/com/test/legacy_app_instance2')",
-				NULL);
-
-			DbusTestDbusMockObject * linstobj = dbus_test_dbus_mock_get_object(mock, "/com/test/legacy_app_instance", "com.ubuntu.Upstart0_6.Instance", NULL);
-			dbus_test_dbus_mock_object_add_property(mock, linstobj,
-				"name",
-				G_VARIANT_TYPE_STRING,
-				g_variant_new_string("multiple-2342345"),
-				NULL);
-			dbus_test_dbus_mock_object_add_property(mock, linstobj,
-				"processes",
-				G_VARIANT_TYPE("a(si)"),
-				g_variant_new_parsed("[('main', 5678)]"),
-				NULL);
-
-			DbusTestDbusMockObject* linstobj2 = dbus_test_dbus_mock_get_object(mock, "/com/test/legacy_app_instance2",
-																			   "com.ubuntu.Upstart0_6.Instance", NULL);
-			dbus_test_dbus_mock_object_add_property(mock, linstobj2, "name", G_VARIANT_TYPE_STRING,
-													g_variant_new_string("single-"), NULL);
-			dbus_test_dbus_mock_object_add_property(mock, linstobj2, "processes", G_VARIANT_TYPE("a(si)"),
-													g_variant_new_parsed("[('main', 5678)]"), NULL);
-
-			/*  Untrusted Helper */
-			DbusTestDbusMockObject * uhelperobj = dbus_test_dbus_mock_get_object(mock, "/com/test/untrusted/helper", "com.ubuntu.Upstart0_6.Job", NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, uhelperobj,
-				"Start",
-				G_VARIANT_TYPE("(asb)"),
-				NULL,
-				"",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, uhelperobj,
-				"Stop",
-				G_VARIANT_TYPE("(asb)"),
-				NULL,
-				"",
-				NULL);
-
-			dbus_test_dbus_mock_object_add_method(mock, uhelperobj,
-				"GetAllInstances",
-				NULL,
-				G_VARIANT_TYPE("ao"),
-				"ret = [ dbus.ObjectPath('/com/test/untrusted/helper/instance'), dbus.ObjectPath('/com/test/untrusted/helper/multi_instance') ]",
-				NULL);
-
-			DbusTestDbusMockObject * uhelperinstance = dbus_test_dbus_mock_get_object(mock, "/com/test/untrusted/helper/instance", "com.ubuntu.Upstart0_6.Instance", NULL);
-			dbus_test_dbus_mock_object_add_property(mock, uhelperinstance,
-				"name",
-				G_VARIANT_TYPE_STRING,
-				g_variant_new_string("untrusted-type::com.foo_bar_43.23.12"),
-				NULL);
-
-			DbusTestDbusMockObject * unhelpermulti = dbus_test_dbus_mock_get_object(mock, "/com/test/untrusted/helper/multi_instance", "com.ubuntu.Upstart0_6.Instance", NULL);
-			dbus_test_dbus_mock_object_add_property(mock, unhelpermulti,
-				"name",
-				G_VARIANT_TYPE_STRING,
-				g_variant_new_string("untrusted-type:24034582324132:com.bar_foo_8432.13.1"),
-				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);
-			dbus_test_dbus_mock_object_add_method(cgmock, cgobject,
-				"GetTasksRecursive",
-				G_VARIANT_TYPE("(ss)"),
-				G_VARIANT_TYPE("ai"),
-				"ret = [100, 200, 300]",
-				NULL);
-
-			/* Put it together */
-			dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
-			dbus_test_service_add_task(service, DBUS_TEST_TASK(cgmock));
-
-			/* Add in Libertine */
-			libertine = std::make_shared<LibertineService>();
-			dbus_test_service_add_task(service, *libertine);
-			dbus_test_service_add_task(service, libertine->waitTask());
-
-			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);
-
-			ASSERT_TRUE(ubuntu_app_launch_observer_add_app_focus(focus_cb, this));
-			ASSERT_TRUE(ubuntu_app_launch_observer_add_app_resume(resume_cb, this));
-		}
-
-		virtual void TearDown() {
-			ubuntu_app_launch_observer_delete_app_focus(focus_cb, this);
-			ubuntu_app_launch_observer_delete_app_resume(resume_cb, this);
-
-			ubuntu::app_launch::Registry::clearDefault();
-
-			libertine.reset();
-			g_clear_object(&mock);
-			g_clear_object(&cgmock);
-			g_clear_object(&service);
-
-			g_object_unref(bus);
-
-			ASSERT_EVENTUALLY_EQ(nullptr, bus);
-		}
-
-		GVariant * find_env (GVariant * env_array, const gchar * var) {
-			unsigned int i;
-			GVariant * retval = nullptr;
-
-			for (i = 0; i < g_variant_n_children(env_array); i++) {
-				GVariant * child = g_variant_get_child_value(env_array, i);
-				const gchar * envvar = g_variant_get_string(child, nullptr);
-
-				if (g_str_has_prefix(envvar, var)) {
-					if (retval != nullptr) {
-						g_warning("Found the env var more than once!");
-						g_variant_unref(retval);
-						return nullptr;
-					}
-
-					retval = child;
-				} else {
-					g_variant_unref(child);
-				}
-			}
-
-			if (!retval) {
-				gchar * envstr = g_variant_print(env_array, FALSE);
-				g_warning("Unable to find '%s' in '%s'", var, envstr);
-				g_free(envstr);
-			}
-
-			return retval;
-		}
-
-		bool check_env (GVariant * env_array, const gchar * var, const gchar * value) {
-			bool found = false;
-			GVariant * val = find_env(env_array, var);
-			if (val == nullptr)
-				return false;
-
-			const gchar * envvar = g_variant_get_string(val, nullptr);
-
-			gchar * combined = g_strdup_printf("%s=%s", var, value);
-			if (g_strcmp0(envvar, combined) == 0) {
-				found = true;
-			}
-
-			g_variant_unref(val);
-
-			return found;
-		}
+protected:
+    DbusTestService *service = NULL;
+    DbusTestDbusMock *mock = NULL;
+    DbusTestDbusMock *cgmock = NULL;
+    std::shared_ptr<LibertineService> libertine;
+    std::shared_ptr<SystemdMock> systemd;
+    GDBusConnection *bus = NULL;
+    std::string last_focus_appid;
+    std::string last_resume_appid;
+    guint resume_timeout = 0;
+
+private:
+    static void focus_cb(const gchar *appid, gpointer user_data)
+    {
+        g_debug("Focus Callback: %s", appid);
+        LibUAL *_this = static_cast<LibUAL *>(user_data);
+        _this->last_focus_appid = appid;
+    }
+
+    static void resume_cb(const gchar *appid, gpointer user_data)
+    {
+        g_debug("Resume Callback: %s", appid);
+        LibUAL *_this = static_cast<LibUAL *>(user_data);
+        _this->last_resume_appid = appid;
+
+        if (_this->resume_timeout > 0)
+        {
+            _this->pause(_this->resume_timeout);
+        }
+    }
+
+protected:
+    /* Useful debugging stuff, but not on by default.  You really want to
+       not get all this noise typically */
+    void debugConnection()
+    {
+        if (true)
+            return;
+
+        DbusTestBustle *bustle = dbus_test_bustle_new("test.bustle");
+        dbus_test_service_add_task(service, DBUS_TEST_TASK(bustle));
+        g_object_unref(bustle);
+
+        DbusTestProcess *monitor = dbus_test_process_new("dbus-monitor");
+        dbus_test_service_add_task(service, DBUS_TEST_TASK(monitor));
+        g_object_unref(monitor);
+    }
+
+    virtual void SetUp()
+    {
+        g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE);
+        g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE);
+        g_setenv("XDG_DATA_HOME", CMAKE_SOURCE_DIR "/libertine-home", TRUE);
+
+        g_setenv("UBUNTU_APP_LAUNCH_SNAPD_SOCKET", LOCAL_SNAPD_TEST_SOCKET, TRUE);
+        g_setenv("UBUNTU_APP_LAUNCH_SNAP_BASEDIR", SNAP_BASEDIR, TRUE);
+        g_setenv("UBUNTU_APP_LAUNCH_DISABLE_SNAPD_TIMEOUT", "You betcha!", TRUE);
+
+        g_setenv("UBUNTU_APP_LAUNCH_SYSTEMD_PATH", "/this/should/not/exist", TRUE);
+        g_setenv("UBUNTU_APP_LAUNCH_SYSTEMD_CGROUP_ROOT", CGROUP_DIR, TRUE);
+
+        g_unlink(LOCAL_SNAPD_TEST_SOCKET);
+
+        service = dbus_test_service_new(NULL);
+
+        debugConnection();
+
+        systemd = std::make_shared<SystemdMock>(
+            std::list<SystemdMock::Instance>{
+                {"application-snap", "unity8-package_foo_x123", {}, getpid(), {100, 200, 300}},
+                {"application-legacy", "multiple", "2342345", 5678, {100, 200, 300}},
+                {"application-legacy", "single", {}, getpid(), {getpid()}},
+                {"untrusted-helper", "com.foo_bar_43.23.12", {}, 1, {100, 200, 300}},
+                {"untrusted-helper", "com.bar_foo_8432.13.1", "24034582324132", 1, {100, 200, 300}}},
+            CGROUP_DIR);
+
+        /* Put it together */
+        dbus_test_service_add_task(service, *systemd);
+
+        /* Add in Libertine */
+        libertine = std::make_shared<LibertineService>();
+        dbus_test_service_add_task(service, *libertine);
+        dbus_test_service_add_task(service, libertine->waitTask());
+
+        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);
+
+        ASSERT_TRUE(ubuntu_app_launch_observer_add_app_focus(focus_cb, this));
+        ASSERT_TRUE(ubuntu_app_launch_observer_add_app_resume(resume_cb, this));
+    }
+
+    virtual void TearDown()
+    {
+        ubuntu_app_launch_observer_delete_app_focus(focus_cb, this);
+        ubuntu_app_launch_observer_delete_app_resume(resume_cb, this);
+
+        ubuntu::app_launch::Registry::clearDefault();
+
+        systemd.reset();
+        libertine.reset();
+        g_clear_object(&service);
+
+        g_object_unref(bus);
+
+        ASSERT_EVENTUALLY_EQ(nullptr, bus);
+
+        g_unlink(LOCAL_SNAPD_TEST_SOCKET);
+    }
+
+    static std::string find_env(std::set<std::string> &envs, std::string var)
+    {
+        auto iter =
+            std::find_if(envs.begin(), envs.end(), [var](std::string value) { return split_env(value).first == var; });
+
+        if (iter == envs.end())
+        {
+            return {};
+        }
+        else
+        {
+            return *iter;
+        }
+    }
+
+    static std::pair<std::string, std::string> split_env(const std::string &env)
+    {
+        auto eq = std::find(env.begin(), env.end(), '=');
+        if (eq == env.end())
+        {
+            throw std::runtime_error{"Environment value is invalid: " + env};
+        }
+
+        return std::make_pair(std::string(env.begin(), eq), std::string(eq + 1, env.end()));
+    }
+
+    static bool check_env(std::set<std::string> &envs, const std::string &key, const std::string &value)
+    {
+        auto val = find_env(envs, key);
+        if (val.empty())
+        {
+            return false;
+        }
+        return split_env(val).second == value;
+    }
 };
 
 #define TASK_STATE(task)                                                   \
@@ -372,1283 +197,823 @@
         [&task] { return dbus_test_task_get_state(DBUS_TEST_TASK(task)); } \
     }
 
+/* Snapd mock data */
+static std::pair<std::string, std::string> interfaces{
+    "GET /v2/interfaces HTTP/1.1\r\nHost: snapd\r\nAccept: */*\r\n\r\n",
+    SnapdMock::httpJsonResponse(SnapdMock::snapdOkay(SnapdMock::interfacesJson(
+        {{"unity8", "unity8-package", {"foo", "single", "xmir", "noxmir"}}, {"mir", "unity8-package", {"foo"}}})))};
+static std::pair<std::string, std::string> u8Package{
+    "GET /v2/snaps/unity8-package HTTP/1.1\r\nHost: snapd\r\nAccept: */*\r\n\r\n",
+    SnapdMock::httpJsonResponse(SnapdMock::snapdOkay(SnapdMock::packageJson(
+        "unity8-package", "active", "app", "1.2.3.4", "x123", {"foo", "single", "xmir", "noxmir"})))};
+
 TEST_F(LibUAL, StartApplication)
 {
-	DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
-
-	/* Basic make sure we can send the event */
-	ASSERT_TRUE(ubuntu_app_launch_start_application("com.test.multiple_first_1.2.3", NULL));
-	EXPECT_EQ(1, dbus_test_dbus_mock_object_check_method_call(mock, obj, "Start", NULL, NULL));
-
-	ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
-
-	/* Now look at the details of the call */
-	ASSERT_TRUE(ubuntu_app_launch_start_application("com.test.multiple_first_1.2.3", NULL));
-
-	guint len = 0;
-	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
-	EXPECT_NE(nullptr, calls);
-	EXPECT_EQ(1u, len);
-
-	EXPECT_STREQ("Start", calls->name);
-	EXPECT_EQ(2u, g_variant_n_children(calls->params));
-
-	GVariant * block = g_variant_get_child_value(calls->params, 1);
-	EXPECT_TRUE(g_variant_get_boolean(block));
-	g_variant_unref(block);
-
-	GVariant * env = g_variant_get_child_value(calls->params, 0);
-	EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
-	g_variant_unref(env);
-
-	ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
-
-	/* Let's pass some URLs */
-	const gchar * urls[] = {
-		"http://ubuntu.com/",
-		"https://ubuntu.com/",
-		"file:///home/phablet/test.txt",
-		NULL
-	};
-	ASSERT_TRUE(ubuntu_app_launch_start_application("com.test.multiple_first_1.2.3", urls));
-
-	len = 0;
-	calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
-	EXPECT_NE(nullptr, calls);
-	EXPECT_EQ(1u, len);
-
-	env = g_variant_get_child_value(calls->params, 0);
-	EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
-	EXPECT_TRUE(check_env(env, "APP_URIS", "'http://ubuntu.com/' 'https://ubuntu.com/' 'file:///home/phablet/test.txt'"));
-	g_variant_unref(env);
-
-	return;
+    /* Basic make sure we can send the event */
+    ASSERT_TRUE(ubuntu_app_launch_start_application("single", NULL));
+
+    std::list<SystemdMock::TransientUnit> calls;
+    ASSERT_EVENTUALLY_FUNC_LT(0u, std::function<unsigned int(void)>([&]() {
+                                  calls = systemd->unitCalls();
+                                  return calls.size();
+                              }));
+    EXPECT_EQ(SystemdMock::instanceName({"application-legacy", "single", {}, 0, {}}), calls.begin()->name);
+
+    systemd->managerClear();
+
+    /* Let's pass some URLs */
+    const gchar *urls[] = {"http://ubuntu.com/", "https://ubuntu.com/", "file:///home/phablet/test.txt", NULL};
+    ASSERT_TRUE(ubuntu_app_launch_start_application("foo", urls));
+
+    ASSERT_EVENTUALLY_FUNC_LT(0u, std::function<unsigned int(void)>([&]() {
+                                  calls = systemd->unitCalls();
+                                  return calls.size();
+                              }));
+
+    EXPECT_EQ("file:///home/phablet/test.txt", *(calls.begin()->execline.rbegin()));
+    EXPECT_EQ("https://ubuntu.com/", *(++calls.begin()->execline.rbegin()));
+    EXPECT_EQ("http://ubuntu.com/", *(++(++calls.begin()->execline.rbegin())));
+
+    return;
 }
 
 TEST_F(LibUAL, StartApplicationTest)
 {
-	DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
-
-	ASSERT_TRUE(ubuntu_app_launch_start_application_test("com.test.multiple_first_1.2.3", NULL));
-
-	guint len = 0;
-	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
-	EXPECT_NE(nullptr, calls);
-	EXPECT_EQ(1u, len);
-
-	EXPECT_STREQ("Start", calls->name);
-	EXPECT_EQ(2u, g_variant_n_children(calls->params));
-
-	GVariant * block = g_variant_get_child_value(calls->params, 1);
-	EXPECT_TRUE(g_variant_get_boolean(block));
-	g_variant_unref(block);
-
-	GVariant * env = g_variant_get_child_value(calls->params, 0);
-	EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
-	EXPECT_TRUE(check_env(env, "QT_LOAD_TESTABILITY", "1"));
-	g_variant_unref(env);
+    ASSERT_TRUE(ubuntu_app_launch_start_application_test("foo", nullptr));
+
+    std::list<SystemdMock::TransientUnit> calls;
+    ASSERT_EVENTUALLY_FUNC_LT(0u, std::function<unsigned int(void)>([&]() {
+                                  calls = systemd->unitCalls();
+                                  return calls.size();
+                              }));
+
+    EXPECT_TRUE(check_env(calls.begin()->environment, "QT_LOAD_TESTABILITY", "1"));
 }
 
 TEST_F(LibUAL, StopApplication)
 {
-	DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
-
-	ASSERT_TRUE(ubuntu_app_launch_stop_application("com.test.good_application_1.2.3"));
-
-	ASSERT_EQ(dbus_test_dbus_mock_object_check_method_call(mock, obj, "Stop", NULL, NULL), 1);
-
+    ASSERT_TRUE(ubuntu_app_launch_stop_application("single"));
+
+    std::list<std::string> calls;
+    ASSERT_EVENTUALLY_FUNC_LT(0u, std::function<unsigned int(void)>([&]() {
+                                  calls = systemd->stopCalls();
+                                  return calls.size();