Merge lp:~justinmcp/unity-chromium-extension/generic-extension into lp:unity-chromium-extension

[Justin McPherson]

Signal available webapps while navigating with Chrome and Webbrowser-app.
Look for compatible webapps in the installed click packages.

Signal available webapps while navigating with Chrome and Webbrowser-app.
Look for compatible webapps in the installed click packages.

[lp:~justinmcp/unity-chromium-extension/generic-extension]

251. By Justin McPherson on 2015-09-24

WIP

252. By Justin McPherson on 2015-09-25

WIP

253. By Justin McPherson on 2015-09-25

WIP

254. By Justin McPherson on 2015-09-25

WIP

255. By Justin McPherson on 2015-09-25

WIP

256. By Justin McPherson on 2015-09-25

WIP

257. By Justin McPherson on 2015-09-28

WIP

258. By Justin McPherson on 2015-10-02

Add tests

259. By Justin McPherson on 2015-10-06

Finish click related tests

260. By Justin McPherson on 2015-10-07

Make checking for maintainer configurable

261. By Justin McPherson on 2015-10-07

Fix leak

Unmerged revisions

261. By Justin McPherson on 2015-10-07

Fix leak

260. By Justin McPherson on 2015-10-07

Make checking for maintainer configurable

259. By Justin McPherson on 2015-10-06

Finish click related tests

258. By Justin McPherson on 2015-10-02

Add tests

257. By Justin McPherson on 2015-09-28

WIP

256. By Justin McPherson on 2015-09-25

WIP

255. By Justin McPherson on 2015-09-25

WIP

254. By Justin McPherson on 2015-09-25

WIP

253. By Justin McPherson on 2015-09-25

WIP

252. By Justin McPherson on 2015-09-25

WIP

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,32 @@
+# vim:expandtab:shiftwidth=2:tabstop=2:
+
+# Copyright (C) 2015 Canonical Ltd.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser GeneraGl Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+cmake_minimum_required(VERSION 2.8.11)
+
+project(unity-chromium-extension)
+
+set(PROJECT_NAME "unity_webapps_chromium")
+set(PROJECT_VERSION "3.3")
+
+include(GNUInstallDirs)
+
+add_subdirectory(chromium-extension)
+add_subdirectory(messaging-host)
+
+enable_testing()
+add_subdirectory(tests)

=== added file 'chromium-extension/CMakeLists.txt'
--- chromium-extension/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ chromium-extension/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,69 @@
+
+set(PEMFILE unity-webapps.pem)
+
+set(EXTENSION_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/libunity-chromium)
+set(EXTENSION_NAME unity-webapps)
+set(EXTENSION_FILE ${EXTENSION_NAME}.crx)
+set(EXTENSION_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_NAME})
+set(EXTENSION_FILES)
+
+list(
+  APPEND EXTENSION_FILES
+  background-page.html
+  background-page.js
+  base-content-script.js
+  browser.js
+  popup.css
+  popup.html
+  popup.js
+  _locales
+  options.html
+  options.js
+  skin
+  unity-api-page-proxy-builder-gen.js
+  unity-api-page-proxy.js
+)
+
+# Create a directory for archiving+signing extension and copy in necessary files
+file(MAKE_DIRECTORY ${EXTENSION_WORKING_DIR})
+file(COPY ${EXTENSION_FILES} DESTINATION ${EXTENSION_WORKING_DIR})
+
+# If we already have a signing key, copy it to the working directory
+if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/${PEMFILE})
+  file(COPY ${CMAKE_CURRENT_LIST_DIR}/${PEMFILE} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+endif()
+
+# fill out config files
+configure_file(manifest.json.in ${EXTENSION_WORKING_DIR}/manifest.json)
+configure_file(unity-webapps.json.in ${CMAKE_CURRENT_BINARY_DIR}/unity-webapps.json)
+
+# If not using the included signing key, generate one  TODO: use key id
+add_custom_command(
+  OUTPUT ${PEMFILE}
+  COMMAND openssl genrsa 1024 > ${PEMFILE}
+)
+
+# Prepare extension
+add_custom_command(
+  OUTPUT ${EXTENSION_FILE}
+  COMMAND ${CMAKE_CURRENT_LIST_DIR}/crxmake.sh ${EXTENSION_NAME} ${PEMFILE}
+  DEPENDS ${PEMFILE}
+)
+
+add_custom_target(
+  build-extension ALL
+  DEPENDS ${EXTENSION_FILE}
+)
+
+# Install extension description in chrome data dir
+# The crxmake.sh script writes this file to ./res
+install(
+  DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/res/
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/chromium/extensions
+  FILES_MATCHING PATTERN "*.json"
+)
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_FILE}
+  DESTINATION ${EXTENSION_DIR}
+)

=== modified file 'chromium-extension/background-page.html'
--- chromium-extension/background-page.html	2014-05-20 13:40:09 +0000
+++ chromium-extension/background-page.html	2015-10-07 04:25:10 +0000
@@ -4,9 +4,9 @@
 
     <title>Unity Webapps Extension Background Page</title>
     <embed type="application/x-unity-webapps-npapi" id="unityChromiumExtensionId"/>
-    
+
     <script src="background-page.js"></script>
-    
+
     </head>
 
     <body>

=== modified file 'chromium-extension/background-page.js'
--- chromium-extension/background-page.js	2014-06-20 06:16:48 +0000
+++ chromium-extension/background-page.js	2015-10-07 04:25:10 +0000
@@ -1,28 +1,28 @@
 /* Chromium Unity integration extension
- * 
+ *
  *   Copyright 2012 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 
+ *   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 
+ *   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 
+ *   You should have received a copy of the GNU General Public License along
  *   with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
 var background_page = (function () {
     // Native messaging support
-    var HOST_ADDRESS = 'com.canonical.webapp.installer';
+    var HOST_ADDRESS = 'com.canonical.webapp.extension';
     var port = null;
     var host_callbacks = [];
 
     var portListener = function (msg) {
-        callback = host_callbacks.pop();  
+        callback = host_callbacks.pop();
         if (callback === undefined) {
             return;
         }
@@ -30,12 +30,10 @@
     };
 
     var portDisconnecter = function () {
-        console.log('UCX: port disconnected');
-        port = null
+        port = null;
     };
 
     var sendNativeMessage = function (msg, callback) {
-        console.log("UCX: sendnativemessage: port=" + port);
         if (port === null) {
             port = chrome.runtime.connectNative(HOST_ADDRESS);
             port.onMessage.addListener(portListener);
@@ -50,46 +48,42 @@
 
 
     /////////////////////////////////////////////////////////
-    // 
-    // Scafolding to keep track of data associated w/ infobar requests 
+    //
+    // Scafolding to keep track of data associated w/ pageaction requests
     // (Chromium's structure imposes some kind of state being maintained
-    // in order to communicate data) 
-    // 
+    // in order to communicate data)
+    //
     ////////////////////////////////////////////////////////
-    // 
+    //
     // list of callback that are to be called asynchronously
     //  per tab. Used in the user integration/installation resquests context.
-    // 
-    // One thing to keep in mind is that one constraint, that bring some amount of
-    //  'soundness' is that there is a hard limit (provided by the browser) of one infobar per tab.
 
-    var user_infobar_request_callbacks = {};
-    var addInfobarRequestCallbackFor = function (infobarRequestId, callback, message, details) {
-        user_infobar_request_callbacks[infobarRequestId] = {
+    var user_popup_request_callbacks = {};
+    var addPopupRequestCallbackFor = function (popupRequestId, callback, message, details) {
+        user_popup_request_callbacks[popupRequestId] = {
             callback: callback,
             message: message,
             details: details
         };
     };
 
-    var getDataIfAnyFor = function (infobarRequestId) {
-        if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
+    var getDataIfAnyFor = function (popupRequestId) {
+        if (user_popup_request_callbacks[popupRequestId] === undefined) {
             return "";
         }
         return {
-            message: user_infobar_request_callbacks[infobarRequestId].message,
-            details: user_infobar_request_callbacks[infobarRequestId].details
+            message: user_popup_request_callbacks[popupRequestId].message,
+            details: user_popup_request_callbacks[popupRequestId].details
         };
     };
-
-    var invokeAndRemoveCallbackIfAnyFor = function (infobarRequestId, arguments) {
-        if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
+    var invokeAndRemoveCallbackIfAnyFor = function (popupRequestId, args) {
+        if (user_popup_request_callbacks[popupRequestId] === undefined) {
             return;
         }
-        var callback = user_infobar_request_callbacks[infobarRequestId].callback;
-        user_infobar_request_callbacks[infobarRequestId] = undefined;
+        var callback = user_popup_request_callbacks[popupRequestId].callback;
+        user_popup_request_callbacks[popupRequestId] = undefined;
         if (typeof(callback) === 'function') {
-            callback(arguments);
+            callback(args);
         }
     };
 
@@ -106,35 +100,37 @@
             },
             function (response) {
                 if (response.available) {
-                    addInfobarRequestCallbackFor(
+                    addPopupRequestCallbackFor(
                         windowInfos.tabId,
                         function (result) {
                             if (result && result.integrate) {
                                 sendNativeMessage({
                                     "method" : "install",
                                     "url" : url
-                                })
+                                });
                             } else {
                                 sendNativeMessage({
                                     "method" : "dont_ask",
                                     "url" : url
-                                })
+                                });
                             }
+
+                            chrome.pageAction.hide(windowInfos.tabId);
                         },
                         chrome.i18n.getMessage("integration_copy", [ response.appName, response.appDomain ]),
                         null);
 
-                    chrome.infobars.show({ tabId: windowInfos.tabId, path: "infobar.html" });
+                    chrome.pageAction.show(windowInfos.tabId);
                 }
             });
-    }; 
-   
-   
+    };
+
+
    // {{{ main request handler
-   
+
    /**
     * Handles & responds to content script requests.
-    * 
+    *
     */
     var init_requested_stamps = {};
     var contentScriptsRequestHandler = function (request, sender, callback) {
@@ -144,10 +140,10 @@
                     logging: false,
                     incognito: sender.tab.incognito
                 };
-	 
+
                 try {
                     if (window.localStorage) {
-                       settings.logging = localStorage['logging'];
+                       settings.logging = localStorage.logging;
                     }
                 }
                 catch (e) {
@@ -156,8 +152,8 @@
 
 	            callback (settings);
             },
-            on_user_infobar_request_result: function (request, sender, callback) {
-                invokeAndRemoveCallbackIfAnyFor (request.tabId, request);
+            on_user_popup_request_result: function (request, sender, callback) {
+                invokeAndRemoveCallbackIfAnyFor(request.tabId, request);
             },
             init_requested: function (request, sender, callback) {
                 sendNativeMessage({
@@ -166,30 +162,32 @@
                     },
                     function (response) {
                         if (response.available) {
-                            addInfobarRequestCallbackFor(
+                            addPopupRequestCallbackFor(
                                 sender.tab.id,
                                 function (result) {
                                     if (result && result.integrate) {
                                         sendNativeMessage({
                                             "method" : "install",
                                             "url" : request.options.url
-                                        })
+                                        });
                                     } else {
                                         sendNativeMessage({
                                             "method" : "dont_ask",
                                             "url" : request.options.url
-                                        })
+                                        });
                                     }
+
+                                    chrome.pageAction.hide(windowInfos.tabId);
                                 },
                                 chrome.i18n.getMessage("integration_copy", [ response.appName, response.appDomain ]),
                                 null);
 
-                            chrome.infobars.show({ tabId: windowInfos.tabId, path: "infobar.html" });
+                            chrome.pageAction.show(windowInfos.tabId);
                         }
                     });
             }
         };
-     
+
         // validate request
         if (!request  || !request.method) {
             callback({ error: "Invalid request structure" });
@@ -200,20 +198,18 @@
             return true;
         }
 
-        if (typeof(request.method) != 'string' || request.method.length == 0) {
+        if (typeof(request.method) != 'string' || request.method.length === 0) {
             callback({ error: "Invalid request method" });
             return true;
         }
 
-        console.log('Got request: ' + request.method);
-
         var handler = handlers [request.method];
         if (handler !== undefined && typeof(handler) == 'function') {
             handler(request, sender, callback);
             return true;
         }
         return false;
-    }
+    };
 
     // Main event handler and communication link
     //   w/ content scripts
@@ -221,18 +217,16 @@
     // }}}
 
     ///////////////////////////////////////////////////////////////////////
-    // 
+    //
     // Window management related functions. In chromeless mode, we have specific
     //  rules for tab management to make webapps feel more "native" than plain
     //  web applications.
-    // 
+    //
     ///////////////////////////////////////////////////////////////////////
 
     var onTabChanged = function (tabId, windowId, url) {
         var onInstalled = function (installed, packageName, appName, appDomain) { };
 
-        console.log("onTabChanged: " + url);
-
         matchesIntegrationScripts(
             null, //plugin,
             url,
@@ -255,15 +249,24 @@
 
     chrome.tabs.onUpdated.addListener(
         function(tabId, changeInfo, tab) {
-            console.log("onUpdated " + changeInfo.url);
             if (changeInfo && changeInfo.url) {
                 onTabChanged(tabId, tab.windowId, changeInfo.url);
             }
         }
     );
 
+    chrome.tabs.onReplaced.addListener(
+        function(addedTabId, removedTabId) {
+            chrome.tabs.get(addedTabId, function(tab) {
+                if (tab && tab.url) {
+                    onTabChanged(addedTabId, tab.windowId, tab.url);
+                }
+            });
+        }
+    );
+
     /*
-     *  Returns a potential message associated with a tab id (infobar)
+     *  Returns a potential message associated with a tab id (popup)
      */
     return {
         getMessageForTabId: function (tabId)  {

=== modified file 'chromium-extension/browser.js'
--- chromium-extension/browser.js	2014-05-20 13:40:09 +0000
+++ chromium-extension/browser.js	2015-10-07 04:25:10 +0000
@@ -10,20 +10,21 @@
    var service = null;
    var api = {
        init: function (options) {
-	   options.url = window.location.href;
-	   options.hostname = window.location.hostname;
-	   options.host = window.location.host;
-	   options.protocol = window.location.protocol;
-	   chrome.runtime.sendMessage (
-	       {method: "init_requested", options: options}
-	       , function (response) {});
+         options.url = window.location.href;
+         options.hostname = window.location.hostname;
+         options.host = window.location.host;
+         options.protocol = window.location.protocol;
+    	   chrome.runtime.sendMessage(
+           {method: "init_requested", options: options},
+           function (response) {}
+         );
        }
    };
 
    /**
     * Inserts a given script in the webpage.
     * Needs chrome.extension functionality.
-    * 
+    *
     * @param path of file to be injected (part of the extension)
     */
    var insertScriptIntoWebpage = function (path) {
@@ -47,14 +48,14 @@
          var e = document.createEvent ("Events");
          d.style.cssText = "display:none;";
          d.value = id;
-         d.addEventListener ("unity-webapps-chromium-api-com-link-callback-called-ack"
-                             , function() { d.parentNode.removeChild (d); }
-                             , true);
+         d.addEventListener("unity-webapps-chromium-api-com-link-callback-called-ack",
+                            function() { d.parentNode.removeChild (d); },
+                            true);
          document.body.appendChild (d);
          e.initEvent ("unity-webapps-chromium-api-com-link-callback-called", false, true);
          d.dispatchEvent (e);
        };
-     };
+     }
 
      // TODO: should be shared / generated w/ web page code
      var isIterableObject = function(obj) {
@@ -75,9 +76,9 @@
        if ( ! isIterableObject(obj)) {
          return obj;
        }
-       if (obj
-           && obj.hasOwnProperty('callbackid')
-           && obj.callbackid != null) {
+       if (obj &&
+           obj.hasOwnProperty('callbackid') &&
+           obj.callbackid !== null) {
          return makeWebpageCallback (obj.callbackid);
        }
 
@@ -87,7 +88,7 @@
 
            if (isIterableObject (obj[key])) {
 
-             if (obj[key].callbackid != null) {
+             if (obj[key].callbackid !== null) {
                ret[key] = makeWebpageCallback (obj[key].callbackid);
              }
              else {
@@ -100,7 +101,7 @@
          }
        }
        return ret;
-     };
+     }
 
      // 2. open the communication mean between the two
 
@@ -120,9 +121,9 @@
          console.log ('Error while dispatching call to ' + funcnames.join('.') + ': ' + err);
        }
      };
-     
-     document.addEventListener("unity-webapps-chromium-api-com-link"
-                               , function(event) {
+
+     document.addEventListener("unity-webapps-chromium-api-com-link",
+                               function(event) {
                                  var from = event.target;
                                  if (from) {
                                    var type = from.getAttribute("data-eventType");
@@ -133,7 +134,7 @@
                                    // Actuall call, e.g. 'Notification.showNotification("a","b")
                                    // being reduces to successive calls to associated objects:
                                    // Notification, showNotification
-                                   // 
+                                   //
                                    // TODO add proper error handling
                                    dispatchActualFunctionCall(type, args);
                                  }
@@ -142,8 +143,8 @@
                                  var ret = document.createEvent('Events');
                                  ret.initEvent('unity-webapps-chromium-api-com-link-ack', true, false);
                                  from.dispatchEvent(ret);
-                               }
-                               , true);
+                               },
+                               true);
    };
 
    // handle the proxy side of the api which is being injected on the
@@ -151,4 +152,3 @@
    injectApiProxy();
  }
 )(window);
-

=== removed file 'chromium-extension/build.sh'
--- chromium-extension/build.sh	2012-04-27 19:34:47 +0000
+++ chromium-extension/build.sh	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/bin/bash -e
-
-
-CRX_FILENAME=`pwd`/../chromium-extension.crx
-PEM_FILENAME=`pwd`/../chromium-extension.pem
-
-if [ -e "$CRX_FILENAME" ]
-then
-    rm -f "$CRX_FILENAME"
-fi
-
-#if [ -e "$PEM_FILENAME" ]
-#then
-#    rm -f "$PEM_FILENAME"
-#fi
-
-if test -n "`which google-chrome`"; then
-    google-chrome --no-message-box --pack-extension=`pwd` --pack-extension-key=../chromium-extension.pem
-else
-    chromium-browser --no-message-box --pack-extension=`pwd`
-fi
-
-# not necessary
-# mv `pwd`/../unity-chromium-extension.crx .
-
-
-

=== removed file 'chromium-extension/chromium-extension.pro'
--- chromium-extension/chromium-extension.pro	2014-05-21 12:53:43 +0000
+++ chromium-extension/chromium-extension.pro	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-include(../common-project-config.pri)
-include($${TOP_SRC_DIR}/common-vars.pri)
-
-TEMPLATE = aux
-
-EXTENSION_DIR = $${INSTALL_LIBDIR}/libunity-chromium
-EXTENSION_NAME = unity-webapps
-EXTENSION_FILE = $${EXTENSION_NAME}.crx
-
-STATIC_EXTENSION_FILES = \
-    background-page.html \
-    background-page.js \
-    base-content-script.js \
-    browser.js \
-    infobar.css \
-    infobar.html \
-    infobar.js \
-    _locales \
-    options.html \
-    options.js \
-    skin \
-    unity-api-page-proxy-builder-gen.js \
-    unity-api-page-proxy.js \
-
-SCRIPT_FILES = \
-    $${STATIC_EXTENSION_FILES} \
-    manifest.json \
-    unity-webapps.json
-
-QMAKE_SUBSTITUTES += \
-    manifest.json.in \
-    unity-webapps.json.in
-
-pemfile.target = unity-webapps.pem
-pemfile.commands = "openssl genrsa 1024 > $${pemfile.target}"
-
-static_files.depends = \
-    $${SCRIPT_FILES}
-static_files.commands = mkdir -p $${OUT_PWD}/$${EXTENSION_NAME} && ${COPY_DIR} $${SCRIPT_FILES} $${OUT_PWD}/$${EXTENSION_NAME}
-
-static_files_stamp.target = buildstamp
-static_files_stamp.depends = static_files
-static_files_stamp.commands = touch $${static_files_stamp.target}
-
-extension.target = res/$${EXTENSION_NAME}.crx
-extension.commands = $${TOP_SRC_DIR}/chromium-extension/crxmake.sh $${OUT_PWD}/$${EXTENSION_NAME} $${pemfile.target}
-extension.depends = pemfile static_files_stamp
-
-QMAKE_EXTRA_TARGETS += \
-    extension \
-    pemfile \
-    static_files \
-    static_files_stamp
-
-PRE_TARGETDEPS = $${extension.target}
-
-manifest.files = \
-    $${OUT_PWD}/res/*.json
-manifest.path = $${INSTALL_PREFIX}/share/chromium/extensions/
-manifest.CONFIG = no_check_exist
-INSTALLS += manifest
-
-crx.files = res/$${EXTENSION_NAME}.crx
-crx.path = $${EXTENSION_DIR}
-crx.CONFIG = no_check_exist
-INSTALLS += crx

=== removed file 'chromium-extension/infobar.css'
--- chromium-extension/infobar.css	2012-05-16 18:19:03 +0000
+++ chromium-extension/infobar.css	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-body {
-  background: -webkit-linear-gradient(#E9E9E9, #DADADA);
-  font-family:  Tahoma, Geneva, sans-serif;
-  font-size: 13px;
-  height: 36px; /* Infobars are limited to 36-72px */
-  margin: 0;
-  overflow: hidden;
-  padding-left: 6px;
-  padding-right: 6px;
-  padding-top: 5px;
-}
-
-img {
-  padding-right: 6px;
-}
-
-button {
-  padding-right: 10px;
-}
-

=== removed file 'chromium-extension/infobar.html'
--- chromium-extension/infobar.html	2012-10-12 01:18:07 +0000
+++ chromium-extension/infobar.html	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<html>
-
-<head>
-</head>
-
-<link rel="stylesheet" type="text/css" href="infobar.css"></link>
-<script src="infobar.js"></script>
-
-<body>
-
-<div id="content" style="display:none">
-  <span id="message"></span>
-  <input type="button" id="notintegrate" value="Never for this site" />
-  <input type="button" id="integrate" value="Yes" onclick="doIntegrate(true)"/>
-</div>
-
-</body>
-
-
-</html>

=== removed file 'chromium-extension/infobar.js'
--- chromium-extension/infobar.js	2014-11-18 07:07:15 +0000
+++ chromium-extension/infobar.js	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-var doIntegrate = function (integrate) {
-  chrome.tabs.query({currentWindow: true, active: true}, function (tabs) {
-    chrome.runtime.sendMessage({tabId: tabs[0].id, method: "on_user_infobar_request_result", integrate: integrate}
-                               , function (response) {});
-    window.close();
-  });
-};
-
-window.onload = function () {
-  chrome.runtime.getBackgroundPage(function (bg) {
-    document.getElementById('notintegrate').onclick = function () { doIntegrate(false); };
-    document.getElementById('integrate').onclick = function () { doIntegrate(true); };
-
-    chrome.tabs.query({currentWindow: true, active: true}, function (tabs) {
-      if (tabs.length === 0) {
-        window.close();
-        return;
-      }
-      if (!bg || !bg.background_page) {
-        window.close();
-        return;
-      }
-      var msg = bg.background_page.getMessageForTabId(tabs[0].id);
-      if (msg == null) {
-        window.close();
-        return;
-      }
-      document.getElementById ('content').style.display = "block";
-      document.getElementById ('message').innerHTML = msg || "";
-    });
-  });
-};
-

=== modified file 'chromium-extension/manifest.json.in'
--- chromium-extension/manifest.json.in	2014-05-21 12:22:21 +0000
+++ chromium-extension/manifest.json.in	2015-10-07 04:25:10 +0000
@@ -1,42 +1,48 @@
 {
-  '"name": "Unity WebApps Chromium extension"',
-  '"manifest_version"': 2,
-  '"minimum_chrome_version": "34.0"',
-  '"content_security_policy"': '"script-src \'self\' chrome-extension://infobar.js \'unsafe-eval\'; object-src \'self\'"',
-
-  '"version": "$${PROJECT_VERSION}"',
-
-  '"description": "Unity Webapps Chromium integration"',
-
-  '"web_accessible_resources"': [
-    '"browser.js"',
-    '"unity-api-page-proxy-builder-gen.js"',
-    '"unity-api-page-proxy.js"',
-    '"infobar.js"',
-    '"options.js"'
+  "name": "Unity WebApps Chromium extension",
+  "manifest_version": 2,
+  "minimum_chrome_version": "34.0",
+  "content_security_policy": "script-src \'self\' chrome-extension://infobar.js \'unsafe-eval\'; object-src \'self\'",
+
+  "version": "${PROJECT_VERSION}",
+
+  "description": "Unity Webapps Chromium integration",
+
+  "web_accessible_resources": [
+    "browser.js",
+    "unity-api-page-proxy-builder-gen.js",
+    "unity-api-page-proxy.js",
+    "options.js"
   ],
 
-  '"icons"': {
-    '"16": "skin/cof-16.png"',
-    '"48": "skin/cof-48.png"'
-  },    
-
-  '"default_locale": "en"',
-
-  '"background"': {
-    '"page"': '"background-page.html"'
-  },  
-
-  '"permissions": ["tabs", "http://*/*", "infobars", "nativeMessaging"]',
-  '"options_page": "options.html"',
-  
-  '"content_scripts"': [
+  "icons": {
+    "16": "skin/cof-16.png",
+    "48": "skin/cof-48.png"
+  },
+
+  "default_locale": "en",
+
+  "background": {
+    "page": "background-page.html"
+  },
+
+  "permissions": ["tabs", "http://*/*", "nativeMessaging"],
+  "page_action": {
+    "default_icon": {
+      "19": "skin/cof-16.png",
+      "38": "skin/cof-48.png"
+    },
+    "default_title": "Unity Webapps",
+    "default_popup": "popup.html"
+  },
+  "options_page": "options.html",
+
+  "content_scripts": [
     {
-      '"all_frames"': true,
-      '"matches": [ "<all_urls>" ]',
-      '"js": ["base-content-script.js"]',
-      '"run_at": "document_end"'
+      "all_frames": true,
+      "matches": [ "<all_urls>" ],
+      "js": ["base-content-script.js"],
+      "run_at": "document_end"
     }
   ]
 }
-

=== modified file 'chromium-extension/options.html'
--- chromium-extension/options.html	2012-11-08 18:15:19 +0000
+++ chromium-extension/options.html	2015-10-07 04:25:10 +0000
@@ -8,23 +8,23 @@
       width: 600px;
       font-size: 13px;
     }
-    
+
     body {
       background-color: "#ebeff9";
       font-family: Arial, sans-serif;
     }
-    
+
     #logo {
       font-size: 20px;
       text-align: center;
     }
-    
+
     #extensionName {
       color: #444;
       font-size: 16px;
       font-weight: 500;
     }
-    
+
     .setting {
       pagging-left: 20px;
     }
@@ -48,5 +48,3 @@
 
 </body>
 </html>
-
-

=== modified file 'chromium-extension/options.js'
--- chromium-extension/options.js	2012-11-08 18:15:19 +0000
+++ chromium-extension/options.js	2015-10-07 04:25:10 +0000
@@ -1,6 +1,6 @@
 function save_options() {
   var logging = document.getElementById("logging");
-  localStorage["logging"] = logging.checked;
+  localStorage.logging = logging.checked;
 }
 
 function restore_options() {
@@ -9,8 +9,8 @@
       document.getElementById('logging').disabled = true;
       return;
   }
- 
-  var logging = localStorage["logging"];
+
+  var logging = localStorage.logging;
   var loggingElt = document.getElementById("logging");
   if (loggingElt) {
     loggingElt.checked = (logging == "true");

=== added file 'chromium-extension/popup.css'
--- chromium-extension/popup.css	1970-01-01 00:00:00 +0000
+++ chromium-extension/popup.css	2015-10-07 04:25:10 +0000
@@ -0,0 +1,21 @@
+body {
+  background: -webkit-linear-gradient(#E9E9E9, #DADADA);
+  font-family:  Tahoma, Geneva, sans-serif;
+  font-size: 13px;
+  height: 36px;
+  width: 300px;
+  margin: 0;
+  overflow: hidden;
+  padding-left: 6px;
+  padding-right: 6px;
+  padding-top: 5px;
+}
+
+img {
+  padding-right: 6px;
+}
+
+button {
+  padding-right: 10px;
+}
+

=== added file 'chromium-extension/popup.html'
--- chromium-extension/popup.html	1970-01-01 00:00:00 +0000
+++ chromium-extension/popup.html	2015-10-07 04:25:10 +0000
@@ -0,0 +1,20 @@
+<html>
+
+<head>
+</head>
+
+<link rel="stylesheet" type="text/css" href="popup.css"></link>
+<script src="popup.js"></script>
+
+<body>
+
+<div id="content" style="display:none">
+  <span id="message"></span>
+  <input type="button" id="notintegrate" value="Never for this site" />
+  <input type="button" id="integrate" value="Yes" onclick="doIntegrate(true)"/>
+</div>
+
+</body>
+
+
+</html>

=== added file 'chromium-extension/popup.js'
--- chromium-extension/popup.js	1970-01-01 00:00:00 +0000
+++ chromium-extension/popup.js	2015-10-07 04:25:10 +0000
@@ -0,0 +1,36 @@
+var doIntegrate = function (integrate) {
+  chrome.tabs.query({currentWindow: true, active: true}, function (tabs) {
+    chrome.runtime.sendMessage({
+                                  tabId: tabs[0].id,
+                                  method: "on_user_popup_request_result",
+                                  integrate: integrate
+                               },
+                               function (response) {});
+    window.close();
+  });
+};
+
+window.onload = function () {
+  chrome.runtime.getBackgroundPage(function (bg) {
+    document.getElementById('notintegrate').onclick = function () { doIntegrate(false); };
+    document.getElementById('integrate').onclick = function () { doIntegrate(true); };
+
+    chrome.tabs.query({currentWindow: true, active: true}, function (tabs) {
+      if (tabs.length === 0) {
+        window.close();
+        return;
+      }
+      if (!bg || !bg.background_page) {
+        window.close();
+        return;
+      }
+      var msg = bg.background_page.getMessageForTabId(tabs[0].id);
+      if (msg === null) {
+        window.close();
+        return;
+      }
+      document.getElementById ('content').style.display = "block";
+      document.getElementById ('message').innerHTML = msg || "";
+    });
+  });
+};

=== modified file 'chromium-extension/unity-api-page-proxy.js'
--- chromium-extension/unity-api-page-proxy.js	2014-05-20 13:40:09 +0000
+++ chromium-extension/unity-api-page-proxy.js	2015-10-07 04:25:10 +0000
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * 
  */
 setTimeout (

=== modified file 'chromium-extension/unity-webapps.json.in'
--- chromium-extension/unity-webapps.json.in	2014-05-21 09:03:42 +0000
+++ chromium-extension/unity-webapps.json.in	2015-10-07 04:25:10 +0000
@@ -1,4 +1,4 @@
 {
-  '"external_crx": "$${EXTENSION_DIR}/$${EXTENSION_FILE}"',
-  '"external_version": "$${PROJECT_VERSION}"'
+  "external_crx": "${EXTENSION_DIR}/${EXTENSION_FILE}",
+  "external_version": "${PROJECT_VERSION}"
 }

=== removed file 'common-project-config.pri'
--- common-project-config.pri	2014-05-19 14:04:19 +0000
+++ common-project-config.pri	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#-----------------------------------------------------------------------------
-# Common configuration for all projects.
-#-----------------------------------------------------------------------------
-
-# we don't like warnings...
-QMAKE_CXXFLAGS += -Werror
-# Disable RTTI
-QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
-
-TOP_SRC_DIR = $$PWD
-TOP_BUILD_DIR = $${TOP_SRC_DIR}/$(BUILD_DIR)
-
-include(coverage.pri)
-
-#-----------------------------------------------------------------------------
-# setup the installation prefix
-#-----------------------------------------------------------------------------
-INSTALL_PREFIX = /usr  # default installation prefix
-
-# default prefix can be overriden by defining PREFIX when running qmake
-isEmpty(PREFIX) {
-    message("====")
-    message("==== NOTE: To override the installation path run: `qmake PREFIX=/custom/path'")
-    message("==== (current installation path is `$${INSTALL_PREFIX}')")
-} else {
-    INSTALL_PREFIX = $${PREFIX}
-    message("====")
-    message("==== install prefix set to `$${INSTALL_PREFIX}'")
-}
-
-INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
-
-isEmpty(LIBDIR) {
-    message("====")
-    message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'")
-    message("==== (current installation path is `$${INSTALL_LIBDIR}')")
-} else {
-    INSTALL_LIBDIR = $${LIBDIR}
-    message("====")
-    message("==== install prefix set to `$${INSTALL_LIBDIR}'")
-}

=== removed file 'common-vars.pri'
--- common-vars.pri	2014-06-02 06:53:38 +0000
+++ common-vars.pri	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#-----------------------------------------------------------------------------
-# Common variables for all projects.
-#-----------------------------------------------------------------------------
-
-PROJECT_NAME = unity_webapps_chromium
-PROJECT_VERSION = 3.2

=== removed file 'coverage.pri'
--- coverage.pri	2014-05-19 14:04:19 +0000
+++ coverage.pri	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# Coverage
-CONFIG(coverage) {
-    OBJECTS_DIR =
-    MOC_DIR =
-    TOP_SRC_DIR = $$PWD
-
-    LIBS += -lgcov
-    QMAKE_CXXFLAGS += --coverage
-    QMAKE_LDFLAGS += --coverage
-
-    QMAKE_EXTRA_TARGETS += coverage cov
-    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
-        generate-coverage-html clean-coverage-html coverage-gcovr \
-        generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
-
-    clean-gcno.commands = \
-        "@echo Removing old coverage instrumentation"; \
-        "find -name '*.gcno' -print | xargs -r rm"
-
-    clean-gcda.commands = \
-        "@echo Removing old coverage results"; \
-        "find -name '*.gcda' -print | xargs -r rm"
-  
-    coverage-html.depends = clean-gcda check generate-coverage-html
-  
-    generate-coverage-html.commands = \
-        "@echo Collecting coverage data"; \
-        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
-        "lcov --extract coverage.info \"*/messaging-host/*.cpp\" -o coverage.info"; \
-        "lcov --remove coverage.info \"moc_*.cpp\" --remove coverage.info \"tests/*.cpp\" -o coverage.info"; \
-        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
-  
-    clean-coverage-html.depends = clean-gcda
-    clean-coverage-html.commands = \
-        "lcov --directory $${TOP_SRC_DIR} -z"; \
-        "rm -rf coverage.info coverage-html"
-
-    coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
-
-    generate-coverage-gcovr.commands = \
-        "@echo Generating coverage GCOVR report"; \
-        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
-
-    clean-coverage-gcovr.depends = clean-gcda
-    clean-coverage-gcovr.commands = \
-        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
-
-    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
-}

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-19 16:49:41 +0000
+++ debian/changelog	2015-10-07 04:25:10 +0000
@@ -1,3 +1,10 @@
+unity-chromium-extension (3.2.1+15.04.20150119-0ubuntu1) vivid; urgency=medium
+
+  * Fixes: 1469601, by changing the notification method to use the pageAction
+    facility for display.
+
+ -- Justin McPherson <[e-mail]>  Tue, 30 Jun 2015 13:18:59 +1000
+
 unity-chromium-extension (3.2.0+15.04.20150119-0ubuntu1) vivid; urgency=medium
 
   [ Justin McPherson ]

=== modified file 'debian/control'
--- debian/control	2014-12-17 14:18:53 +0000
+++ debian/control	2015-10-07 04:25:10 +0000
@@ -1,17 +1,19 @@
 Source: unity-chromium-extension
 Priority: optional
-Maintainer: Ubuntu Desktop Team <[e-mail]>
-Build-Depends: chromium-browser (>= 34.0.1847.116-0ubuntu2),
-               debhelper (>= 9),
+Maintainer: Ubuntu Webapps Team <[e-mail]>
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libglib2.0-dev,
-               libunity-webapps-dev (>= 1.8.0),
+               libunity-webapps-dev (>= 1.8.0) [!armhf],
+               libjson-glib-dev,
+               libclick-0.4-dev,
+               libubuntu-app-launch2-dev,
                openssl,
                pkg-config,
                vim-common,
                zip,
                qt5-default,
-               qt5-qmake,
+               cmake,
                xvfb,
 Standards-Version: 3.9.5
 Section: gnome
@@ -25,9 +27,15 @@
 Architecture: any
 Depends: chromium-browser (>= 34.0.1847.116-0ubuntu2),
          unity-webapps-service,
+         unity-webapps-extension-process,
          webbrowser-app,
          ${misc:Depends},
 Breaks: libunity-webapps-chromium,
 Replaces: libunity-webapps-chromium,
 Description: Unity WebApp extension for the chromium browser
  Chromium browser extension for Unity WebApp integration
+
+Package: unity-webapps-extension-process
+Architecture: any
+Depends: ${misc:Depends},
+Description: Unity WebApp extension for installing or activating local web apps.

=== modified file 'debian/unity-chromium-extension.install'
--- debian/unity-chromium-extension.install	2014-05-22 07:11:49 +0000
+++ debian/unity-chromium-extension.install	2015-10-07 04:25:10 +0000
@@ -1,4 +1,3 @@
-etc/chromium/native-messaging-hosts/com.canonical.webapp.installer.json
-usr/lib/libunity-chromium/unity-webapps.crx
+etc/chromium/native-messaging-hosts/com.canonical.webapp.extension.json
+usr/lib/*/libunity-chromium/unity-webapps.crx
 usr/share/chromium/extensions/*.json
-usr/share/unity-webapps/bin/unity-webapps-messaging-host

=== added file 'debian/unity-webapps-extension-process.install'
--- debian/unity-webapps-extension-process.install	1970-01-01 00:00:00 +0000
+++ debian/unity-webapps-extension-process.install	2015-10-07 04:25:10 +0000
@@ -0,0 +1,1 @@
+usr/share/unity-webapps/bin/*

=== added file 'messaging-host/CMakeLists.txt'
--- messaging-host/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ messaging-host/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,101 @@
+# vim:expandtab:shiftwidth=2:tabstop=2:
+
+# Copyright (C) 2015 Canonical Ltd.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser GeneraGl Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+cmake_minimum_required(VERSION 2.8.11)
+
+project(messaging-host)
+
+set(EXTENSION_NAME webapps-extension)
+set(EXTENSION_MANIFEST com.canonical.webapp.extension.json)
+set(WEBAPPS_BINDIR ${CMAKE_INSTALL_FULL_DATADIR}/unity-webapps/bin)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(SRC)
+
+find_package(PkgConfig)
+find_package(Qt5Core)
+
+pkg_check_modules(GLIB glib-2.0 REQUIRED)
+pkg_check_modules(GOBJECT gobject-2.0 REQUIRED)
+pkg_check_modules(JSON_GLIB json-glib-1.0 REQUIRED)
+pkg_check_modules(CLICK click-0.4 REQUIRED)
+pkg_check_modules(UBUNTU_APP_LAUNCH ubuntu-app-launch-2 REQUIRED)
+pkg_check_modules(WEBAPPS libunity_webapps-0.2)
+pkg_check_modules(WEBAPPS_REPO libunity-webapps-repository)
+
+# Build and install chromium's extension manifest
+configure_file(
+  ${EXTENSION_MANIFEST}.in
+  ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_MANIFEST}
+)
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_MANIFEST}
+  DESTINATION /etc/chromium/native-messaging-hosts
+)
+
+list(
+  APPEND SRC
+  main.cpp
+  connection.cpp
+  inactivity-timer.cpp
+  service.cpp
+  service-handler.cpp
+  click-handler.cpp
+)
+add_definitions(-DHAVE_CLICK_SUPPORT=1)
+
+if(DEFINED WEBAPPS_FOUND AND WEBAPPS_FOUND EQUAL 1)
+  if(DEFINED WEBAPPS_REPO_FOUND AND WEBAPPS_REPO_FOUND EQUAL 1)
+    list(APPEND SRC webapps-handler.cpp webapps-process.cpp)
+    add_definitions(-DHAVE_UNITY_WEBAPPS=1)
+  endif()
+endif()
+
+include_directories(
+  ${GLIB_INCLUDE_DIRS}
+  ${JSON_GLIB_INCLUDE_DIRS}
+  ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS}
+  ${WEBAPPS_INCLUDE_DIRS}
+  ${WEBAPPS_REPO_INCLUDE_DIRS}
+)
+
+add_executable(
+  ${EXTENSION_NAME}
+
+  ${SRC}
+)
+
+target_link_libraries(
+  ${EXTENSION_NAME}
+
+  Qt5::Core
+  ${GLIB_LIBRARIES}
+  ${WEBAPPS_LIBRARIES}
+  ${WEBAPPS_REPO_LIBRARIES}
+  ${JSON_GLIB_LIBRARIES}
+  ${CLICK_LIBRARIES}
+  ${UBUNTU_APP_LAUNCH_LIBRARIES}
+)
+
+install(
+  TARGETS ${EXTENSION_NAME}
+  RUNTIME DESTINATION ${WEBAPPS_BINDIR}
+)

=== removed file 'messaging-host/Makefile.am'
--- messaging-host/Makefile.am	2014-05-14 07:59:30 +0000
+++ messaging-host/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-EXTRA_DIST += \
-    installation-host                

=== added file 'messaging-host/click-handler.cpp'
--- messaging-host/click-handler.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/click-handler.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of webapps-extension
+ *
+ * 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/>.
+ *
+ *  Author: Justin McPherson <[e-mail]>
+ *
+ */
+
+#if defined(HAVE_UNITY_WEBAPPS)
+extern "C" {
+#include <unity-webapps-permissions.h>
+}
+#endif
+
+#include <click-0.4/click.h>
+#include <ubuntu-app-launch.h>
+
+#include "click-handler.h"
+
+#include <QUrl>
+#include <QDebug>
+
+namespace UnityWebapps {
+
+namespace {
+static const gchar* maintainer_key = "maintainer";
+static const gchar* title_key = "title";
+static const gchar* name_key = "name";
+static const gchar* version_key = "version";
+static const gchar* maintainer_name = "Webapps Team <[e-mail]>";
+static const gchar* directory_key = "_directory";
+static const gchar* hooks_key = "hooks";
+static const gchar* urls_key = "urls";
+static const gchar* desktop_key = "desktop";
+static const gchar* domain_suffix_key = "domain-suffix";
+static const gchar* launch_method = "launch_click";
+static const gchar* available_method = "click_available";
+
+gchar* dispatcherFilenameFromManifest(JsonObject *manifest)
+{
+    const gchar* directory = json_object_get_string_member(manifest, directory_key);
+    JsonObject* hooks = json_object_get_object_member(manifest, hooks_key);
+    if (directory == nullptr || hooks == nullptr) {
+        return nullptr;
+    }
+
+    const gchar* dispatcher_filename = nullptr;
+
+    // Search objects in hooks for urls key
+    json_object_foreach_member(hooks, [](JsonObject* object, const gchar* member_name, JsonNode* member_node, gpointer user_data) {
+            const gchar** df = static_cast<const gchar**>(user_data);
+            if (*df != nullptr)
+                return;
+            if (json_node_get_node_type(member_node) != JSON_NODE_OBJECT)
+                return;
+
+            JsonObject *member_object = json_node_get_object(member_node);
+            json_object_foreach_member(member_object, [](JsonObject* object, const gchar* member_name, JsonNode* member_node, gpointer user_data) {
+                    if (g_ascii_strncasecmp(urls_key, member_name, strlen(urls_key)) == 0) {
+                        const gchar** df = static_cast<const gchar**>(user_data);
+                        *df = json_object_get_string_member(object, urls_key);
+                    }
+                }, user_data);
+        }, &dispatcher_filename);
+
+    if (dispatcher_filename == nullptr) {
+        return nullptr;
+    }
+
+    return g_strjoin("/", directory, dispatcher_filename, nullptr);
+}
+
+gchar* appLaunchAppIdFromManifest(JsonObject *manifest)
+{
+    JsonObject* hooks = json_object_get_object_member(manifest, hooks_key);
+    if (hooks == nullptr) {
+        return nullptr;
+    }
+
+    // Find hook used in creation of desktop file
+    gchar* hook_name = nullptr;
+    json_object_foreach_member(hooks, [](JsonObject* object, const gchar* member_name, JsonNode* member_node, gpointer user_data) {
+            gchar** hn = static_cast<gchar**>(user_data);
+            if (*hn != nullptr)
+                return;
+            if (json_node_get_node_type(member_node) != JSON_NODE_OBJECT)
+                return;
+
+            JsonObject *member_object = json_node_get_object(member_node);
+            if (json_object_has_member(member_object, desktop_key)) {
+                *hn = g_strdup(member_name);
+            }
+        }, &hook_name);
+
+    if (hook_name == nullptr) {
+        return nullptr;
+    }
+
+    const gchar* app_name = json_object_get_string_member(manifest, name_key);
+    const gchar* app_version = json_object_get_string_member(manifest, version_key);
+    if (app_name == nullptr || app_version == nullptr) {
+        g_free(hook_name);
+        return nullptr;
+    }
+
+    gchar *result = g_strjoin("_", app_name, hook_name, app_version, nullptr);
+    g_free(hook_name);
+    return result;
+}
+
+GList* domainsFromDispatcherFile(const gchar* dispatcher_filename)
+{
+    GList *domains = nullptr;
+    JsonParser* parser = json_parser_new();
+    GError* error = nullptr;
+    if (!json_parser_load_from_file(parser, dispatcher_filename, &error)) {
+        qDebug() << "Error parsing URL dispatched JSON" << error->message;
+        return nullptr;
+    }
+
+    JsonNode* root = json_parser_get_root(parser);
+    if (json_node_get_node_type(root) != JSON_NODE_ARRAY) {
+        qDebug() << "Unexpected contents of URL dispatcher JSON file";
+        return nullptr;
+    }
+
+    JsonArray* domains_array = json_node_get_array(root);
+    json_array_foreach_element(domains_array, [](JsonArray*, guint index, JsonNode* element_node, gpointer user_data) {
+            if (json_node_get_node_type(element_node) == JSON_NODE_OBJECT) {
+                JsonObject *object = json_node_get_object(element_node);
+                const gchar *domain_suffix = json_object_get_string_member(object, domain_suffix_key);
+                if (domain_suffix != nullptr) {
+                    GList** domains = static_cast<GList**>(user_data);
+                    *domains = g_list_append(*domains, g_strdup(domain_suffix));
+                }
+            }
+        }, &domains);
+
+    g_object_unref(parser);
+
+    return domains;
+}
+
+}
+
+class ClickHandlerPrivate
+{
+    Q_DECLARE_PUBLIC(ClickHandler)
+
+public:
+    inline ClickHandlerPrivate(ClickHandler *service);
+    inline ~ClickHandlerPrivate();
+
+    GList* findMatchingApplications(const QUrl& url);
+
+private:
+    ClickDB* getDatabase();
+
+    ClickHandler *q_ptr;
+    ClickDB *clickDb;
+};
+
+
+ClickHandlerPrivate::ClickHandlerPrivate(ClickHandler *service)
+    : q_ptr(service)
+    , clickDb(nullptr)
+{
+}
+
+ClickHandlerPrivate::~ClickHandlerPrivate()
+{
+    if (clickDb != nullptr) {
+        g_object_unref(G_OBJECT(clickDb));
+    }
+}
+
+GList* ClickHandlerPrivate::findMatchingApplications(const QUrl& url)
+{
+    GError *error = nullptr;
+    JsonArray *manifests = click_db_get_manifests(getDatabase(), true, &error);
+    if (error != nullptr) {
+        qDebug() << __func__ << "error: " << error->message;
+        g_error_free(error);
+        return nullptr;
+    }
+
+    struct _context {
+        GList *matching_apps;
+        const QUrl& visited_url;
+    } context{nullptr, url};
+
+    json_array_foreach_element(manifests, [](JsonArray*, guint index, JsonNode* element_node, gpointer user_data) {
+            _context* context = static_cast<_context*>(user_data);
+
+            if (json_node_get_node_type(element_node) != JSON_NODE_OBJECT) {
+                return;
+            }
+            JsonObject *manifest = json_node_get_object(element_node);
+
+            // Look for maintainer == Webapps Team <[e-mail]>
+            if (qgetenv("UNITY_WEBAPPS_IGNORE_MAINTAINER") != QByteArrayLiteral("1")) {
+                const gchar *maintainer = json_object_get_string_member(manifest, maintainer_key);
+                if (maintainer == nullptr ||
+                    g_ascii_strncasecmp(maintainer, maintainer_name, strlen(maintainer_name)) != 0) {
+                    return;
+                }
+            }
+
+            // Look at url dispatcher
+            gchar* dispatcher_filename = dispatcherFilenameFromManifest(manifest);
+            if (dispatcher_filename == nullptr) {
+                return;
+            }
+
+            GList* domains = domainsFromDispatcherFile(dispatcher_filename);
+            if (domains == nullptr) {
+                g_free(dispatcher_filename);
+                return;
+            }
+
+            for (GList *item = domains; item->next != nullptr; item = item->next) {
+                QStringList visited_url_parts = context->visited_url.host().split(".");
+                QStringList test_url_parts = QString::fromLatin1((gchar*)item->data).split(".");
+                int visited_length = visited_url_parts.length();
+                int test_length = test_url_parts.length();
+                if (visited_length == test_length) {
+                    if (visited_url_parts == test_url_parts) {
+                        json_object_ref(manifest);
+                        context->matching_apps = g_list_append(context->matching_apps, manifest);
+                    }
+                } else {
+                    // Every part of test url must match
+                    if (visited_length >= test_length) {
+                        bool match = true;
+                        for (int i = 1; i < test_length + 1; ++i) {
+                            if (test_url_parts.at(test_length - i) != visited_url_parts.at(visited_length - i)) {
+                                match = false;
+                                break;
+                            }
+                        }
+                        if (match) {
+                            json_object_ref(manifest);
+                            context->matching_apps = g_list_append(context->matching_apps, manifest);
+                        }
+                    }
+                }
+            }
+            g_list_free_full(domains, g_free);
+            g_free(dispatcher_filename);
+        }, &context);
+
+    return context.matching_apps;
+}
+
+
+
+ClickDB* ClickHandlerPrivate::getDatabase()
+{
+    if (clickDb == nullptr) {
+        GError *error = nullptr;
+        clickDb = click_db_new();
+        click_db_read(clickDb, nullptr, &error);
+        if (error != nullptr) {
+            qDebug() << __func__ << "error: " << error->message;
+            g_error_free(error);
+            g_object_unref(clickDb);
+            clickDb = nullptr;
+        }
+    }
+
+    return clickDb;
+}
+
+
+ClickHandler::ClickHandler(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new ClickHandlerPrivate(this))
+{
+}
+
+ClickHandler::~ClickHandler()
+{
+    delete d_ptr;
+}
+
+QVariantMap ClickHandler::click_available(const QVariantMap &message)
+{
+    Q_D(ClickHandler);
+
+    QVariantMap reply;
+    reply.insert("method", available_method);
+    if (!message.contains("url")) {
+        reply.insert("error", QStringLiteral("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+
+    GList *matching_apps = d->findMatchingApplications(QUrl(url));
+
+    if (matching_apps == nullptr) {
+        reply.insert("available", false);
+        return reply;
+    }
+
+    // First element is OK
+    JsonObject* package_object = static_cast<JsonObject*>(matching_apps->data);
+
+    const gchar *appName = json_object_get_string_member(package_object, title_key);
+    const gchar *appDomain = nullptr; /* something from url dispatcher?*/
+    const gchar *appVersion = json_object_get_string_member(package_object, version_key);
+
+#if defined(HAVE_UNITY_WEBAPPS)
+    if (unity_webapps_permissions_get_domain_dontask(appDomain) ||
+        unity_webapps_permissions_get_domain_allowed(appDomain)) {
+        reply.insert("available", false);
+        for (GList *item = matching_apps; item->next != nullptr; item = item->next) {
+            json_object_unref(static_cast<JsonObject*>(item->data));
+        }
+        return reply;
+    }
+#endif
+    reply.insert("available", true);
+    reply.insert("appName", QString::fromUtf8(appName));
+    reply.insert("appDomain", QString::fromUtf8(appDomain));
+    reply.insert("appVersion", QString::fromUtf8(appVersion));
+
+    for (GList *item = matching_apps; item->next != nullptr; item = item->next) {
+        json_object_unref(static_cast<JsonObject*>(item->data));
+    }
+
+    return reply;
+}
+
+QVariantMap ClickHandler::launch_click(const QVariantMap& message)
+{
+    Q_D(ClickHandler);
+
+    QVariantMap reply;
+    reply.insert("method", launch_method);
+
+    if (!message.contains("url")) {
+        reply.insert("error", QLatin1String("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+    reply.insert("url", url);
+
+    GList *matching_apps = d->findMatchingApplications(QUrl(url));
+    if (matching_apps == nullptr) {
+        reply.insert("launched", false);
+        reply.insert("available", false);
+        return reply;
+    }
+
+    // Grab first, convert to an "app id"
+    JsonObject* manifest = (JsonObject*)matching_apps->data;
+
+    gchar* app_id = appLaunchAppIdFromManifest(manifest);
+    if (app_id == nullptr) {
+        reply.insert("launched", false);
+        return reply;
+    }
+
+    gboolean app_launched = ubuntu_app_launch_start_application(app_id,  nullptr);
+    g_free(app_id);
+
+    reply.insert("launched", bool(app_launched));
+    return reply;
+}
+
+} // namespace

=== added file 'messaging-host/click-handler.h'
--- messaging-host/click-handler.h	1970-01-01 00:00:00 +0000
+++ messaging-host/click-handler.h	2015-10-07 04:25:10 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ *
+ *  Author: Justin McPherson <[e-mail]>
+ *
+ */
+
+#ifndef UNITY_WEBAPPS_CLICK_HANDLER
+#define UNITY_WEBAPPS_CLICK_HANDLER
+
+#include <QObject>
+#include <QVariantMap>
+
+namespace UnityWebapps {
+
+class ClickHandlerPrivate;
+class ClickHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ClickHandler(QObject *parent = 0);
+    ~ClickHandler();
+
+public Q_SLOTS:
+    QVariantMap click_available(const QVariantMap& message);
+    QVariantMap launch_click(const QVariantMap& message);
+
+#if defined(UCX_UNDER_TEST)
+public:
+#else
+private:
+#endif
+
+    ClickHandlerPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(ClickHandler)
+};
+
+} // namespace
+
+#endif // UNITY_WEBAPPS_CLICK_HANDLER

=== added file 'messaging-host/com.canonical.webapp.extension.json.in'
--- messaging-host/com.canonical.webapp.extension.json.in	1970-01-01 00:00:00 +0000
+++ messaging-host/com.canonical.webapp.extension.json.in	2015-10-07 04:25:10 +0000
@@ -0,0 +1,9 @@
+{
+    "name": "com.canonical.webapp.extension",
+    "description": "Canonical WebApp Extension Host",
+    "path": "${WEBAPPS_BINDIR}/${EXTENSION_NAME}",
+    "type": "stdio",
+    "allowed_origins": [
+        "chrome-extension://pmoflmbbcfgacopiikdcpmbiellfihdg/"
+    ]
+}

=== removed file 'messaging-host/com.canonical.webapp.installer.json.in'
--- messaging-host/com.canonical.webapp.installer.json.in	2014-05-21 12:32:50 +0000
+++ messaging-host/com.canonical.webapp.installer.json.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{
-    '"name": "com.canonical.webapp.installer"',
-    '"description": "Canonical WebApp Installation Host"',
-    '"path": "$${target.path}/$${TARGET}"',
-    '"type": "stdio"',
-    '"allowed_origins"': [
-        '"chrome-extension://pmoflmbbcfgacopiikdcpmbiellfihdg/"'
-    ]
-}

=== modified file 'messaging-host/main.cpp'
--- messaging-host/main.cpp	2014-06-20 06:16:48 +0000
+++ messaging-host/main.cpp	2015-10-07 04:25:10 +0000
@@ -21,12 +21,22 @@
 #include "connection.h"
 #include "inactivity-timer.h"
 #include "service.h"
+#include "service-handler.h"
+#if defined(HAVE_UNITY_WEBAPPS)
+#include "webapps-process.h"
 #include "webapps-handler.h"
-#include "webapps-process.h"
+#endif
+#if defined(HAVE_CLICK_SUPPORT)
+#include "click-handler.h"
+#endif
 
 #include <QCoreApplication>
 #include <QDebug>
 
+namespace {
+// Time in milliseconds before process exits from timeout.
+const int INACTIVE_TIMEOUT = 2 * 60 * 1000;
+}
 
 void syslogOutputHandler(QtMsgType type, const QMessageLogContext &, const QString &msg)
 {
@@ -61,13 +71,24 @@
 
     QCoreApplication app(argc, argv);
 
+    UnityWebapps::Service service;
+
+    // Handle service wide messages
+    UnityWebapps::ServiceHandler service_handler;
+    service.addHandler(&service_handler);
+
+#if defined(HAVE_UNITY_WEBAPPS)
     UnityWebapps::Process process;
-
-    UnityWebapps::Service service;
-    UnityWebapps::WebappsHandler handler;
-    service.addHandler(&handler);
-
-    UnityWebapps::InactivityTimer inactivityTimer(2 * 60 * 1000);
+    UnityWebapps::WebappsHandler apt_handler;
+    service.addHandler(&apt_handler);
+#endif
+
+#if defined(HAVE_CLICK_SUPPORT)
+    UnityWebapps::ClickHandler click_handler;
+    service.addHandler(&click_handler);
+#endif
+
+    UnityWebapps::InactivityTimer inactivityTimer(INACTIVE_TIMEOUT);
     QObject::connect(&inactivityTimer, SIGNAL(timeout()), &app, SLOT(quit()));
     inactivityTimer.watchObject(&service);
 
@@ -88,4 +109,3 @@
 
     return r;
 }
-

=== removed file 'messaging-host/messaging-host.pro'
--- messaging-host/messaging-host.pro	2014-06-20 06:16:48 +0000
+++ messaging-host/messaging-host.pro	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-include(../common-project-config.pri)
-
-TEMPLATE = app
-TARGET = unity-webapps-messaging-host
-
-CONFIG += \
-    link_pkgconfig \
-    qt
-
-QT += \
-    core
-
-PKGCONFIG += \
-    glib-2.0 \
-    gobject-2.0 \
-    libunity_webapps-0.2 \
-    libunity-webapps-repository \
-
-SOURCES = \
-    connection.cpp \
-    inactivity-timer.cpp \
-    main.cpp \
-    service.cpp \
-    webapps-handler.cpp \
-    webapps-process.cpp \
-
-HEADERS = \
-    connection.h \
-    inactivity-timer.h \
-    service.h \
-    webapps-handler.h \
-    webapps-process.h \
-
-target.path = $${INSTALL_PREFIX}/share/unity-webapps/bin
-INSTALLS += target
-
-QMAKE_SUBSTITUTES += \
-    com.canonical.webapp.installer.json.in
-
-manifest.path = "/etc/chromium/native-messaging-hosts"
-manifest.files = com.canonical.webapp.installer.json
-INSTALLS += manifest

=== added file 'messaging-host/service-handler.cpp'
--- messaging-host/service-handler.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/service-handler.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of webapps-extension
+ *
+ * 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/>.
+ *
+ *  Author: Justin McPherson <[e-mail]>
+ *
+ */
+
+#include "service-handler.h"
+
+#include <QDebug>
+#include <QRegularExpression>
+
+
+namespace UnityWebapps {
+
+class ServiceHandlerPrivate
+{
+    Q_DECLARE_PUBLIC(ServiceHandler)
+
+public:
+    ServiceHandlerPrivate(ServiceHandler *service);
+    ~ServiceHandlerPrivate();
+
+private:
+    mutable ServiceHandler *q_ptr;
+};
+
+
+ServiceHandlerPrivate::ServiceHandlerPrivate(ServiceHandler *service)
+    : q_ptr(service)
+{
+}
+
+ServiceHandlerPrivate::~ServiceHandlerPrivate()
+{
+}
+
+
+ServiceHandler::ServiceHandler(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new ServiceHandlerPrivate(this))
+{
+}
+
+ServiceHandler::~ServiceHandler()
+{
+    delete d_ptr;
+}
+
+QVariantMap ServiceHandler::ping(const QVariantMap &message)
+{
+    Q_UNUSED(message);
+
+    QVariantMap reply;
+
+    reply.insert("pong", QLatin1String("alive"));
+
+    return reply;
+}
+
+} // namespace

=== added file 'messaging-host/service-handler.h'
--- messaging-host/service-handler.h	1970-01-01 00:00:00 +0000
+++ messaging-host/service-handler.h	2015-10-07 04:25:10 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ *
+ *  Author: Justin McPherson <[e-mail]> 
+ *
+ */
+
+#ifndef UNITY_WEBAPPS_SERVICE_HANDLER
+#define UNITY_WEBAPPS_SERVICE_HANDLER
+
+#include <QObject>
+#include <QVariantMap>
+
+namespace UnityWebapps {
+
+class ServiceHandlerPrivate;
+class ServiceHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ServiceHandler(QObject *parent = 0);
+    ~ServiceHandler();
+
+public Q_SLOTS:
+    QVariantMap ping(const QVariantMap &message);
+
+#if defined(UCX_UNDER_TEST)
+public:
+#else
+private:
+#endif
+    ServiceHandlerPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(ServiceHandler)
+};
+
+} // namespace
+
+#endif // UNITY_WEBAPPS_SERVICE_HANDLER
+

=== modified file 'messaging-host/service.cpp'
--- messaging-host/service.cpp	2014-05-21 08:18:12 +0000
+++ messaging-host/service.cpp	2015-10-07 04:25:10 +0000
@@ -45,9 +45,9 @@
 
 } // namespace
 
-ServicePrivate::ServicePrivate(Service *service):
-    m_isIdle(true),
-    q_ptr(service)
+ServicePrivate::ServicePrivate(Service *service)
+    : m_isIdle(true)
+    , q_ptr(service)
 {
 }
 
@@ -59,14 +59,16 @@
 {
     Q_Q(Service);
 
-    if (m_isIdle == isIdle) return;
+    if (m_isIdle == isIdle) {
+      return;
+    }
     m_isIdle = isIdle;
     Q_EMIT q->isIdleChanged();
 }
 
-Service::Service(QObject *parent):
-    QObject(parent),
-    d_ptr(new ServicePrivate(this))
+Service::Service(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new ServicePrivate(this))
 {
 }
 
@@ -83,7 +85,6 @@
 void Service::addHandler(QObject *handler)
 {
     Q_D(Service);
-
     d->m_handlers.append(handler);
 }
 
@@ -92,7 +93,9 @@
     Q_D(Service);
 
     QByteArray method = message.value(QStringLiteral("method")).toString().toLatin1();
-    if (Q_UNLIKELY(method.isEmpty())) return;
+    if (Q_UNLIKELY(method.isEmpty())) {
+        return;
+    }
 
     QByteArray methodSignature = method + "(QVariantMap)";
 
@@ -103,13 +106,17 @@
     Q_FOREACH(QObject *handler, d->m_handlers) {
         const QMetaObject *metaObject = handler->metaObject();
         int index = metaObject->indexOfMethod(methodSignature);
-        if (index == -1) continue;
+        if (index == -1) {
+            continue;
+        }
 
         QMetaMethod metaMethod = metaObject->method(index);
         ok = metaMethod.invoke(handler,
                                Q_RETURN_ARG(QVariantMap, reply),
                                Q_ARG(QVariantMap, message));
-        if (ok) break;
+        if (ok) {
+            break;
+        }
     }
 
     if (ok) {

=== modified file 'messaging-host/webapps-handler.cpp'
--- messaging-host/webapps-handler.cpp	2014-06-23 06:49:03 +0000
+++ messaging-host/webapps-handler.cpp	2015-10-07 04:25:10 +0000
@@ -48,24 +48,30 @@
                               UnityWebappsApplicationStatus status,
                               gpointer user_data);
 
-    mutable WebappsHandler *q_ptr;
+    WebappsHandler *q_ptr;
+    UnityWebappsService *service;
     UnityWebappsApplicationRepository *applicationRepository;
 };
 
 } // namespace
 
 
-WebappsHandlerPrivate::WebappsHandlerPrivate(WebappsHandler *service):
-    q_ptr(service),
-    applicationRepository(0)
+WebappsHandlerPrivate::WebappsHandlerPrivate(WebappsHandler *handler)
+    : q_ptr(handler)
+    , service(nullptr)
+    , applicationRepository(nullptr)
 {
+    service = unity_webapps_service_new();
 }
 
 WebappsHandlerPrivate::~WebappsHandlerPrivate()
 {
-    if (applicationRepository != 0) {
+    if (applicationRepository != nullptr) {
         g_object_unref(G_OBJECT(applicationRepository));
     }
+    if (service != nullptr) {
+        g_object_unref(service);
+    }
 }
 
 UnityWebappsApplicationRepository *WebappsHandlerPrivate::getRepository()
@@ -285,17 +291,6 @@
     return reply;
 }
 
-QVariantMap WebappsHandler::ping(const QVariantMap &message)
-{
-    Q_UNUSED(message);
-
-    QVariantMap reply;
-
-    reply.insert("pong", QLatin1String("alive"));
-
-    return reply;
-}
-
 /*
     \fn createApplicationDesktopName(QString, QString)
 
@@ -321,4 +316,3 @@
 
     return QStringLiteral("application://%1.desktop").arg(basename);
 }
-

=== modified file 'messaging-host/webapps-handler.h'
--- messaging-host/webapps-handler.h	2014-06-23 07:32:13 +0000
+++ messaging-host/webapps-handler.h	2015-10-07 04:25:10 +0000
@@ -38,7 +38,6 @@
     QVariantMap url_loaded(const QVariantMap &message);
     QVariantMap dont_ask(const QVariantMap &message);
     QVariantMap install(const QVariantMap &message);
-    QVariantMap ping(const QVariantMap &message);
 
 #if defined(UCX_UNDER_TEST)
 public:

=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(unit)

=== removed file 'tests/tests.pro'
--- tests/tests.pro	2014-05-19 14:04:19 +0000
+++ tests/tests.pro	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = \
-    unit

=== added file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(messaging-host)

=== added file 'tests/unit/messaging-host/CMakeLists.txt'
--- tests/unit/messaging-host/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,5 @@
+add_subdirectory(connection)
+add_subdirectory(inactivity-timer)
+add_subdirectory(webapps-handler)
+add_subdirectory(click-handler)
+add_subdirectory(service)

=== added directory 'tests/unit/messaging-host/click-handler'
=== added file 'tests/unit/messaging-host/click-handler/CMakeLists.txt'
--- tests/unit/messaging-host/click-handler/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/click-handler/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,38 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+find_package(PkgConfig)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+
+pkg_check_modules(GLIB glib-2.0 REQUIRED)
+pkg_check_modules(GOBJECT gobject-2.0 REQUIRED)
+pkg_check_modules(JSON_GLIB json-glib-1.0 REQUIRED)
+pkg_check_modules(CLICK click-0.4 REQUIRED)
+pkg_check_modules(UBUNTU_APP_LAUNCH ubuntu-app-launch-2 REQUIRED)
+
+
+set(TEST tst_ClickHandler)
+set(SOURCES
+  ${messaging-host_SOURCE_DIR}/click-handler.cpp
+  tst_click-handler.cpp
+)
+
+include_directories(
+  ${messaging-host_SOURCE_DIR}
+  ${GLIB_INCLUDE_DIRS}
+  ${JSON_GLIB_INCLUDE_DIRS}
+  ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS}
+)
+
+add_executable(${TEST} ${SOURCES})
+
+target_link_libraries(${TEST}
+  Qt5::Core
+  Qt5::Test
+  ${GLIB_LIBRARIES}
+  ${JSON_GLIB_LIBRARIES}
+)
+
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)

=== added file 'tests/unit/messaging-host/click-handler/tst_click-handler.cpp'
--- tests/unit/messaging-host/click-handler/tst_click-handler.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/click-handler/tst_click-handler.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ */
+
+#include <click-0.4/click.h>
+#include <ubuntu-app-launch.h>
+
+#include "click-handler.h"
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTest>
+
+
+// {{{ mock implementations
+ClickDB* click_db_new(void)
+{
+    return (ClickDB*)g_object_new(G_TYPE_OBJECT, 0);
+}
+
+void click_db_read(ClickDB* self, const gchar* db_dir, GError** error)
+{
+}
+
+JsonArray* click_db_get_manifests(ClickDB* self, gboolean all_versions, GError** error)
+{
+    const gchar* example_json =
+"["
+"{"
+"    \"_directory\": \"/custom/click/.click/users/@all/com.ubuntu.developer.webapps.webapp-gmail\","
+"    \"_removable\": 1,"
+"    \"architecture\": \"all\","
+"    \"description\": \"Gmail (webapp version)\","
+"    \"framework\": \"ubuntu-sdk-14.10-dev2\","
+"    \"hooks\": {"
+"        \"webapp-gmail\": {"
+"            \"account-application\": \"webapp-gmail.application\","
+"            \"account-service\": \"webapp-gmail.service\","
+"            \"apparmor\": \"webapp-gmail.json\","
+"            \"desktop\": \"webapp-gmail.desktop\","
+"            \"urls\": \"gmail.url-dispatcher\""
+"        },"
+"        \"webapp-gmail-helper\": {"
+"            \"apparmor\": \"gmail-helper-apparmor.json\","
+"            \"push-helper\": \"gmail-helper.json\""
+"        }"
+"    },"
+"    \"installed-size\": \"22\","
+"    \"maintainer\": \"Webapps Team <[e-mail]>\","
+"    \"name\": \"com.ubuntu.developer.webapps.webapp-gmail\","
+"    \"title\": \"webapp-gmail\","
+"    \"version\": \"1.0.25\""
+"},"
+"{"
+"    \"_directory\": \"/custom/click/.click/users/@all/com.ubuntu.developer.webapps.webapp-facebook\","
+"    \"_removable\": 1,"
+"    \"architecture\": \"all\","
+"    \"description\": \"Facebook (webapp version)\","
+"    \"framework\": \"ubuntu-sdk-14.10\","
+"    \"hooks\": {"
+"        \"webapp-facebook\": {"
+"            \"account-application\": \"webapp-facebook.application\","
+"            \"account-service\": \"webapp-facebook.service\","
+"            \"apparmor\": \"webapp-facebook.json\","
+"            \"content-hub\": \"content-hub/webapp-facebook.json\","
+"            \"desktop\": \"webapp-facebook.desktop\","
+"            \"urls\": \"facebook.url-dispatcher\""
+"        },"
+"        \"webapp-facebook-helper\": {"
+"            \"apparmor\": \"facebook-helper-apparmor.json\","
+"            \"push-helper\": \"facebook-helper.json\""
+"        }"
+"    },"
+"    \"installed-size\": \"887\","
+"    \"maintainer\": \"Webapps Team <[e-mail]>\","
+"    \"name\": \"com.ubuntu.developer.webapps.webapp-facebook\","
+"    \"title\": \"Facebook\","
+"    \"version\": \"1.2\""
+"}"
+"]";
+
+    JsonParser* parser = json_parser_new();
+    if (!json_parser_load_from_data(parser, example_json, strlen(example_json), error)) {
+        qDebug() << "Error parsing URL dispatched JSON" << (*error)->message;
+        return nullptr;
+    }
+
+    JsonNode *root_node = json_parser_get_root(parser);
+    if (json_node_get_node_type(root_node) != JSON_NODE_ARRAY) {
+        return nullptr;
+    }
+
+    return json_node_get_array(root_node);
+}
+
+gboolean json_parser_load_from_file(JsonParser *parser, const gchar* filename, GError **error)
+{
+    const gchar* dispatcher_template =
+"["
+"  {"
+"    \"protocol\": \"http\","
+"    \"domain-suffix\": \"%s.com\""
+"  },"
+"  {"
+"    \"protocol\": \"https\","
+"    \"domain-suffix\": \"%s.com\""
+"  }"
+"]";
+
+    gchar *dispatcher_json = nullptr;
+    if (g_strrstr(filename, "gmail") != NULL) {
+        dispatcher_json = g_strdup_printf(dispatcher_template, "google");
+    } else if (g_strrstr(filename, "facebook") != NULL) {
+        dispatcher_json = g_strdup_printf(dispatcher_template, "facebook");
+    }
+
+    if (!json_parser_load_from_data(parser, dispatcher_json, strlen(dispatcher_json), error)) {
+        qDebug() << "Error parsing URL dispatched JSON" << (*error)->message;
+        g_free(dispatcher_json);
+        return false;
+    }
+
+    g_free(dispatcher_json);
+
+    return true;
+}
+
+gboolean ubuntu_app_launch_start_application(const gchar* appid, const gchar* const* uris)
+{
+    return true;
+}
+// }}}
+
+class ClickHandlerTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    ClickHandlerTest();
+
+private Q_SLOTS:
+    void testClickAvailableReturnsMethodName();
+    void testClickAvailableUrlMustBeValid();
+    void testClickAvailableApps_data();
+    void testClickAvailableApps();
+    void testLaunchClickReturnsMethodName();
+    void testLaunchClickUrlMustBeValid();
+    void testLaunchClick_data();
+    void testLaunchClick();
+};
+
+ClickHandlerTest::ClickHandlerTest():
+    QObject(nullptr)
+{
+}
+
+void ClickHandlerTest::testClickAvailableReturnsMethodName()
+{
+    UnityWebapps::ClickHandler handler;
+
+    QVariantMap message;
+    message.insert("method", "click_available");
+
+    QVariantMap reply = handler.click_available(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("method").toString(), QStringLiteral("click_available"));
+}
+
+void ClickHandlerTest::testClickAvailableUrlMustBeValid()
+{
+    UnityWebapps::ClickHandler handler;
+
+    QVariantMap message;
+    message.insert("method", "click_available");
+
+    QVariantMap reply = handler.click_available(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void ClickHandlerTest::testClickAvailableApps_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("available");
+    QTest::addColumn<QString>("appName");
+    QTest::addColumn<QString>("appDomain");
+    QTest::addColumn<QString>("appVersion");
+
+    QTest::newRow("available") << "https://mail.google.com/" << true << "webapp-gmail" << "mail.google.com" << "1.0.25";
+    QTest::newRow("available") << "https://m.facebook.com/" << true << "Facebook" << "m.facebook.com" << "1.2";
+    QTest::newRow("not_available") << "http://www.example.com/" << false << "None" << "None" << "0.0.0";
+}
+
+void ClickHandlerTest::testClickAvailableApps()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, available);
+    QFETCH(QString, appName);
+    QFETCH(QString, appDomain);
+    QFETCH(QString, appVersion);
+
+    UnityWebapps::ClickHandler handler;
+
+    QVariantMap message;
+    message.insert("method", "click_available");
+    message.insert("url", url);
+
+    QVariantMap reply = handler.click_available(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("available").toBool(), available);
+    if (available) {
+        QCOMPARE(appName, reply.value("appName").toString());
+        // QCOMPARE(appDomain, reply.value("appDomain").toString()); // Not currently available
+        QCOMPARE(appVersion, reply.value("appVersion").toString());
+    }
+}
+
+void ClickHandlerTest::testLaunchClickReturnsMethodName()
+{
+    UnityWebapps::ClickHandler handler;
+
+    QVariantMap message;
+    message.insert("method", "launch_click");
+
+    QVariantMap reply = handler.launch_click(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("method").toString(), QStringLiteral("launch_click"));
+}
+
+void ClickHandlerTest::testLaunchClickUrlMustBeValid()
+{
+    UnityWebapps::ClickHandler handler;
+
+    QVariantMap message;
+    message.insert("method", "launch_click");
+
+    QVariantMap reply = handler.click_available(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void ClickHandlerTest::testLaunchClick_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("success");
+
+    QTest::newRow("launchable") << "https://mail.google.com/" << true;
+    QTest::newRow("launchable") << "https://m.facebook.com/" << true;
+    QTest::newRow("not_launchable") << "http://www.example.com/" << false;
+}
+
+void ClickHandlerTest::testLaunchClick()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, success);
+
+    UnityWebapps::ClickHandler handler;
+
+    QVariantMap message;
+    message.insert("method", "launch_click");
+    message.insert("url", url);
+
+    QVariantMap reply = handler.launch_click(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("launched").toBool(), success);
+}
+
+
+QTEST_MAIN(ClickHandlerTest);
+
+#include "tst_click-handler.moc"

=== added directory 'tests/unit/messaging-host/connection'
=== removed file 'tests/unit/messaging-host/connection-host.cpp'
--- tests/unit/messaging-host/connection-host.cpp	2014-05-20 12:21:50 +0000
+++ tests/unit/messaging-host/connection-host.cpp	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This file is part of unity-chromium-extension
- *
- * 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/>.
- */
-
-#include <QCoreApplication>
-#include <QDebug>
-#include "connection.h"
-
-class Handler: public QObject
-{
-    Q_OBJECT
-
-public:
-    Handler(): QObject() {}
-
-    bool openConnection();
-
-public Q_SLOTS:
-    void onMessageReceived(const QVariantMap &message);
-
-private:
-    UnityWebapps::Connection m_connection;
-};
-
-bool Handler::openConnection()
-{
-    QObject::connect(&m_connection,
-                     SIGNAL(messageReceived(const QVariantMap &)),
-                     this,
-                     SLOT(onMessageReceived(const QVariantMap &)));
-    return m_connection.open();
-}
-
-void Handler::onMessageReceived(const QVariantMap &message)
-{
-    // Generate a predictable reply
-    QVariantMap reply;
-    reply.insert("count", message.count());
-    QStringList keys = message.uniqueKeys();
-    reply.insert("keys", keys);
-    m_connection.postMessage(reply);
-}
-
-int main(int argc, char **argv)
-{
-    QCoreApplication app(argc, argv);
-    Handler handler;
-
-    if (!handler.openConnection()) {
-        qCritical() << "Connection::open() failed!";
-        return EXIT_FAILURE;
-    }
-
-    return app.exec();
-}
-
-#include "connection-host.moc"

=== added file 'tests/unit/messaging-host/connection/CMakeLists.txt'
--- tests/unit/messaging-host/connection/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/connection/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,40 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+
+# Test server process
+add_executable(
+  connection-host
+
+  ${messaging-host_SOURCE_DIR}/connection.cpp
+  connection-host.cpp
+)
+
+target_link_libraries(
+  connection-host
+
+  Qt5::Core
+)
+
+# Test proper
+set(TEST tst_Connection)
+set(SOURCES
+  tst_connection.cpp
+)
+
+add_executable(${TEST} ${SOURCES})
+add_dependencies(${TEST} connection-host)
+
+include_directories(${messaging-host_SOURCE_DIR})
+
+target_link_libraries(
+  ${TEST}
+
+  Qt5::Core
+  Qt5::Test
+)
+
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)

=== added file 'tests/unit/messaging-host/connection/connection-host.cpp'
--- tests/unit/messaging-host/connection/connection-host.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/connection/connection-host.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ */
+
+#include <QCoreApplication>
+#include <QDebug>
+#include "connection.h"
+
+class Handler: public QObject
+{
+    Q_OBJECT
+
+public:
+    Handler(): QObject() {}
+
+    bool openConnection();
+
+public Q_SLOTS:
+    void onMessageReceived(const QVariantMap &message);
+
+private:
+    UnityWebapps::Connection m_connection;
+};
+
+bool Handler::openConnection()
+{
+    QObject::connect(&m_connection,
+                     SIGNAL(messageReceived(const QVariantMap &)),
+                     this,
+                     SLOT(onMessageReceived(const QVariantMap &)));
+    return m_connection.open();
+}
+
+void Handler::onMessageReceived(const QVariantMap &message)
+{
+    // Generate a predictable reply
+    QVariantMap reply;
+    reply.insert("count", message.count());
+    QStringList keys = message.uniqueKeys();
+    reply.insert("keys", keys);
+    m_connection.postMessage(reply);
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    Handler handler;
+
+    if (!handler.openConnection()) {
+        qCritical() << "Connection::open() failed!";
+        return EXIT_FAILURE;
+    }
+
+    return app.exec();
+}
+
+#include "connection-host.moc"

=== added file 'tests/unit/messaging-host/connection/tst_connection.cpp'
--- tests/unit/messaging-host/connection/tst_connection.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/connection/tst_connection.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ */
+
+#include <QByteArray>
+#include <QDebug>
+#include <QJsonDocument>
+#include <QProcess>
+#include <QSet>
+#include <QSignalSpy>
+#include <QTest>
+
+class ConnectionTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    ConnectionTest();
+
+    void postMessage(const QByteArray &message);
+    QByteArray readReply();
+    QVariantMap jsonToMap(const QByteArray &json);
+
+private Q_SLOTS:
+    void init();
+    void cleanup();
+    void testMessaging();
+
+private:
+    QProcess m_process;
+};
+
+ConnectionTest::ConnectionTest():
+    QObject(0)
+{
+    m_process.setProgram("./connection-host");
+    m_process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
+    m_process.setReadChannel(QProcess::StandardOutput);
+}
+
+void ConnectionTest::postMessage(const QByteArray &message)
+{
+    quint32 length = message.length();
+
+    m_process.write((char *)&length, sizeof(length));
+    m_process.write(message);
+}
+
+QByteArray ConnectionTest::readReply()
+{
+    quint32 length;
+    m_process.waitForReadyRead();
+    m_process.read((char *)&length, sizeof(length));
+    return m_process.read(length);
+}
+
+QVariantMap ConnectionTest::jsonToMap(const QByteArray &json)
+{
+    QJsonDocument doc = QJsonDocument::fromJson(json);
+    return doc.toVariant().toMap();
+}
+
+void ConnectionTest::init()
+{
+    m_process.start();
+    m_process.waitForStarted();
+}
+
+void ConnectionTest::cleanup()
+{
+    m_process.kill();
+    m_process.waitForFinished();
+}
+
+void ConnectionTest::testMessaging()
+{
+    postMessage("{\"msg\":\"hi\"}");
+    QVariantMap reply = jsonToMap(readReply());
+    QCOMPARE(reply.count(), 2);
+    QCOMPARE(reply.value("count").toInt(), 1);
+    QCOMPARE(reply.value("keys").toStringList(), QStringList() << "msg");
+
+    postMessage("{\"list\": [\"one\", \"two\"],"
+                "\"name\": \"Tom\","
+                "\"number\": 23}");
+    reply = jsonToMap(readReply());
+    QCOMPARE(reply.count(), 2);
+    QCOMPARE(reply.value("count").toInt(), 3);
+    QSet<QString> expectedKeys;
+    expectedKeys << "list" << "name" << "number";
+    QCOMPARE(reply.value("keys").toStringList().toSet(), expectedKeys);
+
+    m_process.terminate();
+}
+
+QTEST_MAIN(ConnectionTest);
+
+#include "tst_connection.moc"

=== added directory 'tests/unit/messaging-host/inactivity-timer'
=== added file 'tests/unit/messaging-host/inactivity-timer/CMakeLists.txt'
--- tests/unit/messaging-host/inactivity-timer/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/inactivity-timer/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,23 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+
+set(TEST tst_InactivityTimer)
+set(SOURCES
+  ${messaging-host_SOURCE_DIR}/inactivity-timer.cpp
+  tst_inactivity_timer.cpp
+)
+
+add_executable(${TEST} ${SOURCES})
+
+include_directories(${messaging-host_SOURCE_DIR})
+
+target_link_libraries(${TEST}
+  Qt5::Core
+  Qt5::Test
+)
+
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)

=== added file 'tests/unit/messaging-host/inactivity-timer/tst_inactivity_timer.cpp'
--- tests/unit/messaging-host/inactivity-timer/tst_inactivity_timer.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/inactivity-timer/tst_inactivity_timer.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ */
+
+#include "inactivity-timer.h"
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTest>
+
+using namespace UnityWebapps;
+
+class Service: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isIdle READ isIdle NOTIFY isIdleChanged)
+
+public:
+    Service(): QObject(), m_isIdle(true) {}
+
+    bool isIdle() const { return m_isIdle; }
+
+    void setIdle(bool idle) {
+        if (idle == m_isIdle) return;
+        m_isIdle = idle;
+        Q_EMIT isIdleChanged();
+    }
+
+Q_SIGNALS:
+    void isIdleChanged();
+
+private:
+    bool m_isIdle;
+};
+
+class InactivityTimerTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    InactivityTimerTest();
+
+private Q_SLOTS:
+    void testAlwaysIdle();
+    void testBecomeIdle();
+    void testManyServices();
+};
+
+InactivityTimerTest::InactivityTimerTest():
+    QObject(0)
+{
+}
+
+void InactivityTimerTest::testAlwaysIdle()
+{
+    InactivityTimer timer(10);
+    QSignalSpy timeout(&timer, SIGNAL(timeout()));
+
+    Service service;
+    timer.watchObject(&service);
+
+    QVERIFY(timeout.wait(100));
+}
+
+void InactivityTimerTest::testBecomeIdle()
+{
+    InactivityTimer timer(10);
+    QSignalSpy timeout(&timer, SIGNAL(timeout()));
+
+    Service service;
+    service.setIdle(false);
+    timer.watchObject(&service);
+
+    /* No signal should be emitted, as the service is not idle */
+    QVERIFY(!timeout.wait(100));
+
+    service.setIdle(true);
+    QVERIFY(timeout.wait(100));
+}
+
+void InactivityTimerTest::testManyServices()
+{
+    InactivityTimer timer(50);
+    QSignalSpy timeout(&timer, SIGNAL(timeout()));
+
+    Service service1;
+    timer.watchObject(&service1);
+
+    Service service2;
+    timer.watchObject(&service2);
+
+    Service service3;
+    service3.setIdle(false);
+    timer.watchObject(&service3);
+
+    /* No signal should be emitted, as service3 is not idle */
+    QVERIFY(!timeout.wait(100));
+
+    /* Now set it is as idle, but soon afterwards set service1 as busy */
+    service3.setIdle(true);
+    QTest::qWait(10);
+    service1.setIdle(false);
+    QVERIFY(!timeout.wait(100));
+
+    service1.setIdle(true);
+    QVERIFY(timeout.wait(100));
+}
+
+QTEST_MAIN(InactivityTimerTest);
+
+#include "tst_inactivity_timer.moc"

=== removed file 'tests/unit/messaging-host/messaging-host.pri'
--- tests/unit/messaging-host/messaging-host.pri	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/messaging-host.pri	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-include(../../../common-project-config.pri)
-
-CONFIG += \
-    debug
-
-SRC_DIR = $${TOP_SRC_DIR}/messaging-host
-
-INCLUDEPATH += \
-    $${SRC_DIR}

=== removed file 'tests/unit/messaging-host/messaging-host.pro'
--- tests/unit/messaging-host/messaging-host.pro	2014-05-23 10:16:49 +0000
+++ tests/unit/messaging-host/messaging-host.pro	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = \
-    tst_connection \
-    tst_connection_host \
-    tst_inactivity_timer.pro \
-    tst_service.pro \
-    tst_webapps-handler.pro \
-
-tst_connection.file = tst_connection.pro
-tst_connection_host.file = tst_connection_host.pro
-
-tst_connection.depends = tst_connection_host

=== added directory 'tests/unit/messaging-host/service'
=== added file 'tests/unit/messaging-host/service/CMakeLists.txt'
--- tests/unit/messaging-host/service/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/service/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,23 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+
+set(TEST tst_Service)
+set(SOURCES
+  ${messaging-host_SOURCE_DIR}/service.cpp
+  tst_service.cpp
+)
+
+add_executable(${TEST} ${SOURCES})
+
+include_directories(${messaging-host_SOURCE_DIR})
+
+target_link_libraries(${TEST}
+  Qt5::Core
+  Qt5::Test
+)
+
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)

=== added file 'tests/unit/messaging-host/service/tst_service.cpp'
--- tests/unit/messaging-host/service/tst_service.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/service/tst_service.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ */
+
+#include "service.h"
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTest>
+
+class Handler1: public QObject
+{
+    Q_OBJECT
+
+public:
+    Handler1() {}
+
+public Q_SLOTS:
+    QVariantMap sayHello(const QVariantMap &params);
+    QVariantMap countArguments(const QVariantMap &params);
+};
+
+QVariantMap Handler1::sayHello(const QVariantMap &params)
+{
+    QVariantMap reply;
+    reply.insert("greeting",
+                 QString("Hello %1").arg(params.value("name").toString()));
+    return reply;
+}
+
+QVariantMap Handler1::countArguments(const QVariantMap &params)
+{
+    QVariantMap reply;
+    // We subtract one, because that's the "method" field
+    reply.insert("count", params.count() - 1);
+    return reply;
+}
+
+class Handler2: public QObject
+{
+    Q_OBJECT
+
+public:
+    Handler2() {}
+
+public Q_SLOTS:
+    QVariantMap listArguments(const QVariantMap &params);
+};
+
+QVariantMap Handler2::listArguments(const QVariantMap &params)
+{
+    QVariantMap reply;
+    QStringList arguments = params.keys();
+    arguments.removeAll("method");
+    reply.insert("arguments", arguments);
+    return reply;
+}
+
+class ServiceTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    ServiceTest();
+
+private Q_SLOTS:
+    void testNoHandlers();
+    void testNonExisting();
+    void testHandling();
+};
+
+ServiceTest::ServiceTest():
+    QObject(0)
+{
+}
+
+void ServiceTest::testNoHandlers()
+{
+    UnityWebapps::Service service;
+    QSignalSpy messageHandled(&service, SIGNAL(messageHandled(const QVariantMap &)));
+
+    QVariantMap message;
+    message.insert("method", QString("sayHello"));
+    message.insert("name", QString("Tom"));
+    service.handleMessage(message);
+
+    QCOMPARE(messageHandled.count(), 0);
+    QVERIFY(service.isIdle());
+}
+
+void ServiceTest::testNonExisting()
+{
+    UnityWebapps::Service service;
+    QSignalSpy messageHandled(&service, SIGNAL(messageHandled(const QVariantMap &)));
+
+    Handler1 handler1;
+    service.addHandler(&handler1);
+
+    QVariantMap message;
+    message.insert("method", QString("nonExistingMethod"));
+    service.handleMessage(message);
+
+    QCOMPARE(messageHandled.count(), 0);
+    QVERIFY(service.isIdle());
+
+    // Add the second service (it still should fail)
+    Handler2 handler2;
+    service.addHandler(&handler2);
+
+    service.handleMessage(message);
+
+    QCOMPARE(messageHandled.count(), 0);
+    QVERIFY(service.isIdle());
+}
+
+void ServiceTest::testHandling()
+{
+    UnityWebapps::Service service;
+    QSignalSpy messageHandled(&service, SIGNAL(messageHandled(const QVariantMap &)));
+    QSignalSpy isIdleChanged(&service, SIGNAL(isIdleChanged()));
+    QVERIFY(service.isIdle());
+
+    Handler1 handler1;
+    service.addHandler(&handler1);
+
+    QVariantMap message;
+    message.insert("method", QString("sayHello"));
+    message.insert("name", QString("Tom"));
+    service.handleMessage(message);
+
+    QCOMPARE(messageHandled.count(), 1);
+    QVariantMap reply = messageHandled.at(0).at(0).toMap();
+    QCOMPARE(reply.value("greeting").toString(), QString("Hello Tom"));
+    messageHandled.clear();
+    QCOMPARE(isIdleChanged.count(), 2);
+    isIdleChanged.clear();
+    QVERIFY(service.isIdle());
+
+    // Make sure it continues to work when we add a second handler
+    Handler2 handler2;
+    service.addHandler(&handler2);
+    service.handleMessage(message);
+
+    QCOMPARE(messageHandled.count(), 1);
+    reply = messageHandled.at(0).at(0).toMap();
+    QCOMPARE(reply.value("greeting").toString(), QString("Hello Tom"));
+    messageHandled.clear();
+    QCOMPARE(isIdleChanged.count(), 2);
+    isIdleChanged.clear();
+    QVERIFY(service.isIdle());
+
+    // Test a method from the second handler
+    message.clear();
+    message.insert("method", QString("listArguments"));
+    message.insert("number", 1);
+    message.insert("string", QString("Hello"));
+    message.insert("boolean", false);
+    service.handleMessage(message);
+
+    QCOMPARE(messageHandled.count(), 1);
+    reply = messageHandled.at(0).at(0).toMap();
+    QVERIFY(reply.contains("arguments"));
+    QStringList expectedArguments;
+    expectedArguments << "number" << "string" << "boolean";
+    QCOMPARE(reply.value("arguments").toStringList().toSet(),
+             expectedArguments.toSet());
+    messageHandled.clear();
+    QCOMPARE(isIdleChanged.count(), 2);
+    isIdleChanged.clear();
+    QVERIFY(service.isIdle());
+}
+
+QTEST_MAIN(ServiceTest);
+
+#include "tst_service.moc"

=== removed file 'tests/unit/messaging-host/tst_connection.cpp'
--- tests/unit/messaging-host/tst_connection.cpp	2014-05-20 12:21:50 +0000
+++ tests/unit/messaging-host/tst_connection.cpp	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This file is part of unity-chromium-extension
- *
- * 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/>.
- */
-
-#include <QByteArray>
-#include <QDebug>
-#include <QJsonDocument>
-#include <QProcess>
-#include <QSet>
-#include <QSignalSpy>
-#include <QTest>
-
-class ConnectionTest: public QObject
-{
-    Q_OBJECT
-
-public:
-    ConnectionTest();
-
-    void postMessage(const QByteArray &message);
-    QByteArray readReply();
-    QVariantMap jsonToMap(const QByteArray &json);
-
-private Q_SLOTS:
-    void init();
-    void cleanup();
-    void testMessaging();
-
-private:
-    QProcess m_process;
-};
-
-ConnectionTest::ConnectionTest():
-    QObject(0)
-{
-    m_process.setProgram("./connection-host");
-    m_process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-    m_process.setReadChannel(QProcess::StandardOutput);
-}
-
-void ConnectionTest::postMessage(const QByteArray &message)
-{
-    quint32 length = message.length();
-
-    m_process.write((char *)&length, sizeof(length));
-    m_process.write(message);
-}
-
-QByteArray ConnectionTest::readReply()
-{
-    quint32 length;
-    m_process.waitForReadyRead();
-    m_process.read((char *)&length, sizeof(length));
-    return m_process.read(length);
-}
-
-QVariantMap ConnectionTest::jsonToMap(const QByteArray &json)
-{
-    QJsonDocument doc = QJsonDocument::fromJson(json);
-    return doc.toVariant().toMap();
-}
-
-void ConnectionTest::init()
-{
-    m_process.start();
-    m_process.waitForStarted();
-}
-
-void ConnectionTest::cleanup()
-{
-    m_process.kill();
-    m_process.waitForFinished();
-}
-
-void ConnectionTest::testMessaging()
-{
-    postMessage("{\"msg\":\"hi\"}");
-    QVariantMap reply = jsonToMap(readReply());
-    QCOMPARE(reply.count(), 2);
-    QCOMPARE(reply.value("count").toInt(), 1);
-    QCOMPARE(reply.value("keys").toStringList(), QStringList() << "msg");
-
-    postMessage("{\"list\": [\"one\", \"two\"],"
-                "\"name\": \"Tom\","
-                "\"number\": 23}");
-    reply = jsonToMap(readReply());
-    QCOMPARE(reply.count(), 2);
-    QCOMPARE(reply.value("count").toInt(), 3);
-    QSet<QString> expectedKeys;
-    expectedKeys << "list" << "name" << "number";
-    QCOMPARE(reply.value("keys").toStringList().toSet(), expectedKeys);
-
-    m_process.terminate();
-}
-
-QTEST_MAIN(ConnectionTest);
-
-#include "tst_connection.moc"

=== removed file 'tests/unit/messaging-host/tst_connection.pro'
--- tests/unit/messaging-host/tst_connection.pro	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/tst_connection.pro	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-include(messaging-host.pri)
-
-TARGET = tst_connection
-
-QT += \
-    core \
-    testlib
-
-SOURCES += \
-    tst_connection.cpp
-
-check.commands = "xvfb-run -s '-screen 0 640x480x24' -a ./$${TARGET}"
-check.depends = $${TARGET}
-QMAKE_EXTRA_TARGETS += check

=== removed file 'tests/unit/messaging-host/tst_connection_host.pro'
--- tests/unit/messaging-host/tst_connection_host.pro	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/tst_connection_host.pro	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-include(messaging-host.pri)
-
-TEMPLATE = app
-TARGET = connection-host
-
-QT += \
-    core
-
-SOURCES = \
-    $${SRC_DIR}/connection.cpp \
-    connection-host.cpp
-
-HEADERS = \
-    $${SRC_DIR}/connection.h \

=== removed file 'tests/unit/messaging-host/tst_inactivity_timer.cpp'
--- tests/unit/messaging-host/tst_inactivity_timer.cpp	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/tst_inactivity_timer.cpp	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This file is part of unity-chromium-extension
- *
- * 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/>.
- */
-
-#include "inactivity-timer.h"
-
-#include <QDebug>
-#include <QSignalSpy>
-#include <QTest>
-
-using namespace UnityWebapps;
-
-class Service: public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool isIdle READ isIdle NOTIFY isIdleChanged)
-
-public:
-    Service(): QObject(), m_isIdle(true) {}
-
-    bool isIdle() const { return m_isIdle; }
-
-    void setIdle(bool idle) {
-        if (idle == m_isIdle) return;
-        m_isIdle = idle;
-        Q_EMIT isIdleChanged();
-    }
-
-Q_SIGNALS:
-    void isIdleChanged();
-
-private:
-    bool m_isIdle;
-};
-
-class InactivityTimerTest: public QObject
-{
-    Q_OBJECT
-
-public:
-    InactivityTimerTest();
-
-private Q_SLOTS:
-    void testAlwaysIdle();
-    void testBecomeIdle();
-    void testManyServices();
-};
-
-InactivityTimerTest::InactivityTimerTest():
-    QObject(0)
-{
-}
-
-void InactivityTimerTest::testAlwaysIdle()
-{
-    InactivityTimer timer(10);
-    QSignalSpy timeout(&timer, SIGNAL(timeout()));
-
-    Service service;
-    timer.watchObject(&service);
-
-    QVERIFY(timeout.wait(100));
-}
-
-void InactivityTimerTest::testBecomeIdle()
-{
-    InactivityTimer timer(10);
-    QSignalSpy timeout(&timer, SIGNAL(timeout()));
-
-    Service service;
-    service.setIdle(false);
-    timer.watchObject(&service);
-
-    /* No signal should be emitted, as the service is not idle */
-    QVERIFY(!timeout.wait(100));
-
-    service.setIdle(true);
-    QVERIFY(timeout.wait(100));
-}
-
-void InactivityTimerTest::testManyServices()
-{
-    InactivityTimer timer(50);
-    QSignalSpy timeout(&timer, SIGNAL(timeout()));
-
-    Service service1;
-    timer.watchObject(&service1);
-
-    Service service2;
-    timer.watchObject(&service2);
-
-    Service service3;
-    service3.setIdle(false);
-    timer.watchObject(&service3);
-
-    /* No signal should be emitted, as service3 is not idle */
-    QVERIFY(!timeout.wait(100));
-
-    /* Now set it is as idle, but soon afterwards set service1 as busy */
-    service3.setIdle(true);
-    QTest::qWait(10);
-    service1.setIdle(false);
-    QVERIFY(!timeout.wait(100));
-
-    service1.setIdle(true);
-    QVERIFY(timeout.wait(100));
-}
-
-QTEST_MAIN(InactivityTimerTest);
-
-#include "tst_inactivity_timer.moc"

=== removed file 'tests/unit/messaging-host/tst_inactivity_timer.pro'
--- tests/unit/messaging-host/tst_inactivity_timer.pro	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/tst_inactivity_timer.pro	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-include(messaging-host.pri)
-
-TARGET = tst_inactivity_timer
-
-QT += \
-    core \
-    testlib
-
-SOURCES += \
-    $${SRC_DIR}/inactivity-timer.cpp \
-    tst_inactivity_timer.cpp
-
-HEADERS += \
-    $${SRC_DIR}/inactivity-timer.h
-
-check.commands = "xvfb-run -s '-screen 0 640x480x24' -a ./$${TARGET}"
-check.depends = $${TARGET}
-QMAKE_EXTRA_TARGETS += check

=== removed file 'tests/unit/messaging-host/tst_service.cpp'
--- tests/unit/messaging-host/tst_service.cpp	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/tst_service.cpp	1970-01-01 00:00:00 +0000
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This file is part of unity-chromium-extension
- *
- * 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/>.
- */
-
-#include "service.h"
-
-#include <QDebug>
-#include <QSignalSpy>
-#include <QTest>
-
-class Handler1: public QObject
-{
-    Q_OBJECT
-
-public:
-    Handler1() {}
-
-public Q_SLOTS:
-    QVariantMap sayHello(const QVariantMap &params);
-    QVariantMap countArguments(const QVariantMap &params);
-};
-
-QVariantMap Handler1::sayHello(const QVariantMap &params)
-{
-    QVariantMap reply;
-    reply.insert("greeting",
-                 QString("Hello %1").arg(params.value("name").toString()));
-    return reply;
-}
-
-QVariantMap Handler1::countArguments(const QVariantMap &params)
-{
-    QVariantMap reply;
-    // We subtract one, because that's the "method" field
-    reply.insert("count", params.count() - 1);
-    return reply;
-}
-
-class Handler2: public QObject
-{
-    Q_OBJECT
-
-public:
-    Handler2() {}
-
-public Q_SLOTS:
-    QVariantMap listArguments(const QVariantMap &params);
-};
-
-QVariantMap Handler2::listArguments(const QVariantMap &params)
-{
-    QVariantMap reply;
-    QStringList arguments = params.keys();
-    arguments.removeAll("method");
-    reply.insert("arguments", arguments);
-    return reply;
-}
-
-class ServiceTest: public QObject
-{
-    Q_OBJECT
-
-public:
-    ServiceTest();
-
-private Q_SLOTS:
-    void testNoHandlers();
-    void testNonExisting();
-    void testHandling();
-};
-
-ServiceTest::ServiceTest():
-    QObject(0)
-{
-}
-
-void ServiceTest::testNoHandlers()
-{
-    UnityWebapps::Service service;
-    QSignalSpy messageHandled(&service, SIGNAL(messageHandled(const QVariantMap &)));
-
-    QVariantMap message;
-    message.insert("method", QString("sayHello"));
-    message.insert("name", QString("Tom"));
-    service.handleMessage(message);
-
-    QCOMPARE(messageHandled.count(), 0);
-    QVERIFY(service.isIdle());
-}
-
-void ServiceTest::testNonExisting()
-{
-    UnityWebapps::Service service;
-    QSignalSpy messageHandled(&service, SIGNAL(messageHandled(const QVariantMap &)));
-
-    Handler1 handler1;
-    service.addHandler(&handler1);
-
-    QVariantMap message;
-    message.insert("method", QString("nonExistingMethod"));
-    service.handleMessage(message);
-
-    QCOMPARE(messageHandled.count(), 0);
-    QVERIFY(service.isIdle());
-
-    // Add the second service (it still should fail)
-    Handler2 handler2;
-    service.addHandler(&handler2);
-
-    service.handleMessage(message);
-
-    QCOMPARE(messageHandled.count(), 0);
-    QVERIFY(service.isIdle());
-}
-
-void ServiceTest::testHandling()
-{
-    UnityWebapps::Service service;
-    QSignalSpy messageHandled(&service, SIGNAL(messageHandled(const QVariantMap &)));
-    QSignalSpy isIdleChanged(&service, SIGNAL(isIdleChanged()));
-    QVERIFY(service.isIdle());
-
-    Handler1 handler1;
-    service.addHandler(&handler1);
-
-    QVariantMap message;
-    message.insert("method", QString("sayHello"));
-    message.insert("name", QString("Tom"));
-    service.handleMessage(message);
-
-    QCOMPARE(messageHandled.count(), 1);
-    QVariantMap reply = messageHandled.at(0).at(0).toMap();
-    QCOMPARE(reply.value("greeting").toString(), QString("Hello Tom"));
-    messageHandled.clear();
-    QCOMPARE(isIdleChanged.count(), 2);
-    isIdleChanged.clear();
-    QVERIFY(service.isIdle());
-
-    // Make sure it continues to work when we add a second handler
-    Handler2 handler2;
-    service.addHandler(&handler2);
-    service.handleMessage(message);
-
-    QCOMPARE(messageHandled.count(), 1);
-    reply = messageHandled.at(0).at(0).toMap();
-    QCOMPARE(reply.value("greeting").toString(), QString("Hello Tom"));
-    messageHandled.clear();
-    QCOMPARE(isIdleChanged.count(), 2);
-    isIdleChanged.clear();
-    QVERIFY(service.isIdle());
-
-    // Test a method from the second handler
-    message.clear();
-    message.insert("method", QString("listArguments"));
-    message.insert("number", 1);
-    message.insert("string", QString("Hello"));
-    message.insert("boolean", false);
-    service.handleMessage(message);
-
-    QCOMPARE(messageHandled.count(), 1);
-    reply = messageHandled.at(0).at(0).toMap();
-    QVERIFY(reply.contains("arguments"));
-    QStringList expectedArguments;
-    expectedArguments << "number" << "string" << "boolean";
-    QCOMPARE(reply.value("arguments").toStringList().toSet(),
-             expectedArguments.toSet());
-    messageHandled.clear();
-    QCOMPARE(isIdleChanged.count(), 2);
-    isIdleChanged.clear();
-    QVERIFY(service.isIdle());
-}
-
-QTEST_MAIN(ServiceTest);
-
-#include "tst_service.moc"

=== removed file 'tests/unit/messaging-host/tst_service.pro'
--- tests/unit/messaging-host/tst_service.pro	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/tst_service.pro	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-include(messaging-host.pri)
-
-TARGET = tst_service
-
-QT += \
-    core \
-    testlib
-
-SOURCES += \
-    $${SRC_DIR}/service.cpp \
-    tst_service.cpp
-
-HEADERS += \
-    $${SRC_DIR}/service.h
-
-check.commands = "xvfb-run -s '-screen 0 640x480x24' -a ./$${TARGET}"
-check.depends = $${TARGET}
-QMAKE_EXTRA_TARGETS += check

=== removed file 'tests/unit/messaging-host/tst_webapps-handler.cpp'
--- tests/unit/messaging-host/tst_webapps-handler.cpp	2014-06-23 07:32:13 +0000
+++ tests/unit/messaging-host/tst_webapps-handler.cpp	1970-01-01 00:00:00 +0000
@@ -1,354 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This file is part of unity-chromium-extension
- *
- * 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/>.
- */
-
-extern "C" {
-#include <unity-webapps-permissions.h>
-#include <unity-webapps-application-repository.h>
-}
-
-#include "webapps-handler.h"
-
-#include <QDebug>
-#include <QSignalSpy>
-#include <QTest>
-
-
-// {{{ mock implementations
-struct AppInfo {
-    bool install;
-    bool allowed;
-    bool dontask;
-    UnityWebappsApplicationStatus status;
-    QString name;
-    QString domain;
-};
-
-QMap<QString, AppInfo> _mock_app_info;
-
-UnityWebappsApplicationRepository *unity_webapps_application_repository_new_default()
-{
-    return (UnityWebappsApplicationRepository*)g_object_new(G_TYPE_OBJECT, 0);
-}
-
-gboolean unity_webapps_application_repository_prepare(UnityWebappsApplicationRepository *repository)
-{
-    Q_UNUSED(repository);
-
-    return true;
-}
-
-GList * unity_webapps_application_repository_resolve_url(UnityWebappsApplicationRepository *repository, const gchar *url)
-{
-    Q_UNUSED(repository);
-
-    if (!_mock_app_info.contains(QString::fromUtf8(url))) {
-        return 0;
-    }
-
-    return g_list_append((GList*)0, (gpointer)g_strdup(url));
-}
-
-UnityWebappsApplicationStatus
-unity_webapps_application_repository_get_resolved_application_status(
-    UnityWebappsApplicationRepository *repository,
-    const gchar *application
-)
-{
-    Q_UNUSED(repository);
-
-    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
-        return UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED;
-    }
-
-    return _mock_app_info.value(QString::fromUtf8(application)).status;
-}
-
-const gchar *
-unity_webapps_application_repository_get_resolved_application_name(UnityWebappsApplicationRepository *repository,
-                                                                    const gchar *application)
-{
-    Q_UNUSED(repository);
-
-    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
-        return 0;
-    }
-
-    return g_strdup(_mock_app_info.value(QString::fromUtf8(application)).name.toLocal8Bit().constData());
-}
-
-const gchar *
-unity_webapps_application_repository_get_resolved_application_domain(UnityWebappsApplicationRepository *repository,
-																	  const gchar *application)
-{
-    Q_UNUSED(repository);
-
-    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
-        return 0;
-    }
-
-    return g_strdup(_mock_app_info.value(QString::fromUtf8(application)).domain.toLocal8Bit().constData());
-}
-
-
-gboolean unity_webapps_permissions_get_domain_allowed(const gchar *domain)
-{
-    Q_FOREACH(const QString &key, _mock_app_info.keys()) {
-        AppInfo appInfo = _mock_app_info.value(key);
-        if (appInfo.domain == QLatin1String(domain)) {
-            return appInfo.allowed;
-        }
-    }
-
-    return false;
-}
-
-gboolean unity_webapps_permissions_get_domain_dontask(const gchar *domain)
-{
-    Q_FOREACH(const QString &key, _mock_app_info.keys()) {
-        AppInfo appInfo = _mock_app_info.value(key);
-        if (appInfo.domain == QLatin1String(domain)) {
-            return appInfo.dontask;
-        }
-    }
-
-    return false;
-}
-
-void unity_webapps_permissions_dontask_domain(const gchar *domain)
-{
-    Q_UNUSED(domain);
-}
-
-void
-unity_webapps_application_repository_install_application(UnityWebappsApplicationRepository *repository, const gchar *name,
-														 UnityWebappsApplicationRepositoryInstallCallback callback, gpointer user_data)
-{
-    Q_UNUSED(repository);
-    Q_UNUSED(name);
-    Q_UNUSED(callback);
-    Q_UNUSED(user_data);
-}
-
-// }}}
-
-
-class WebappsHandlerTest : public QObject
-{
-    Q_OBJECT
-
-public:
-    WebappsHandlerTest();
-
-private Q_SLOTS:
-    void initTestCase();
-    void cleanupTestCase();
-    void testUrlLoadedMalformedRequest();
-    void testUrlLoaded_data();
-    void testUrlLoaded();
-    void testDontAskMalformedRequest();
-    void testDontAsk_data();
-    void testDontAsk();
-    void testInstallMalformedRequest();
-    void testInstall_data();
-    void testInstall();
-    void testCreateApplicationDesktopName_data();
-    void testCreateApplicationDesktopName();
-};
-
-WebappsHandlerTest::WebappsHandlerTest():
-    QObject(0)
-{
-}
-
-
-void WebappsHandlerTest::initTestCase()
-{
-    _mock_app_info.insert("https://mail.google.com/", { true, false, false, UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE, "Gmail", "mail.google.com" });
-    _mock_app_info.insert("http://www.tumblr.com/", { false, true, true, UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE, "Tumblr", "www.tumblr.com" });
-}
-
-void WebappsHandlerTest::cleanupTestCase()
-{
-}
-
-void WebappsHandlerTest::testUrlLoadedMalformedRequest()
-{
-    UnityWebapps::WebappsHandler handler;
-
-    QVariantMap message;
-    message.insert("method", QString("url_loaded"));
-
-    QVariantMap reply = handler.url_loaded(message);
-
-    QVERIFY(!reply.empty());
-    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
-}
-
-void WebappsHandlerTest::testUrlLoaded_data()
-{
-    QTest::addColumn<QString>("url");
-    QTest::addColumn<bool>("available");
-    QTest::addColumn<QString>("appName");
-    QTest::addColumn<QString>("appDomain");
-
-    QTest::newRow("available") << "https://mail.google.com/" << true << "Gmail" << "mail.google.com";
-    QTest::newRow("not_available") << "http://www.example.com/" << false << "None" << "None";
-}
-
-void WebappsHandlerTest::testUrlLoaded()
-{
-    QFETCH(QString, url);
-    QFETCH(bool, available);
-    QFETCH(QString, appName);
-    QFETCH(QString, appDomain);
-
-    QVariantMap message;
-    message.insert("method", QString("url_loaded"));
-    message.insert("url", url);
-
-    UnityWebapps::WebappsHandler handler;
-    QVariantMap reply = handler.url_loaded(message);
-
-    QVERIFY(!reply.empty());
-    QCOMPARE(reply.value("available").toBool(), available);
-    if (available) {
-        QCOMPARE(appName, reply.value("appName").toString());
-        QCOMPARE(appDomain, reply.value("appDomain").toString());
-    }
-}
-
-void WebappsHandlerTest::testDontAskMalformedRequest()
-{
-    UnityWebapps::WebappsHandler handler;
-
-    QVariantMap message;
-    message.insert("method", QString("dont_ask"));
-
-    QVariantMap reply = handler.url_loaded(message);
-
-    QVERIFY(!reply.empty());
-    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
-}
-
-void WebappsHandlerTest::testDontAsk_data()
-{
-    QTest::addColumn<QString>("url");
-    QTest::addColumn<bool>("available");
-
-    QTest::newRow("ask") << "https://mail.google.com/" << true;
-    QTest::newRow("dont_ask") << "http://www.tumblr.com/" << true;
-    QTest::newRow("no app") << "http://www.example.com/" << false;
-}
-
-void WebappsHandlerTest::testDontAsk()
-{
-    QFETCH(QString, url);
-    QFETCH(bool, available);
-
-    UnityWebapps::WebappsHandler handler;
-
-    QVariantMap message;
-    message.insert("method", QString("dont_ask"));
-    message.insert("url", url);
-
-    QVariantMap reply = handler.dont_ask(message);
-
-    QVERIFY(!reply.empty());
-    if (available) {
-        QCOMPARE(reply.value("dont_ask").toBool(), true);
-    } else {
-        QCOMPARE(reply.value("dont_ask").toBool(), false);
-        QCOMPARE(reply.value("available").toBool(), false);
-    }
-}
-
-void WebappsHandlerTest::testInstallMalformedRequest()
-{
-    UnityWebapps::WebappsHandler handler;
-
-    QVariantMap message;
-    message.insert("method", QString("install"));
-
-    QVariantMap reply = handler.url_loaded(message);
-
-    QVERIFY(!reply.empty());
-    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
-}
-
-void WebappsHandlerTest::testInstall_data()
-{
-    QTest::addColumn<QString>("url");
-    QTest::addColumn<bool>("available");
-    QTest::addColumn<bool>("installed");
-
-    QTest::newRow("installs") << "https://mail.google.com/" << true << true;
-    QTest::newRow("wont install") << "http://www.tumblr.com/" << true << false;
-    QTest::newRow("no app") << "http://www.example.com/" << false << false;
-}
-
-void WebappsHandlerTest::testInstall()
-{
-    QFETCH(QString, url);
-    QFETCH(bool, available);
-    QFETCH(bool, installed);
-
-    QVariantMap message;
-    message.insert("method", QString("install"));
-    message.insert("url", url);
-
-    UnityWebapps::WebappsHandler handler;
-    QVariantMap reply = handler.install(message);
-
-    QVERIFY(!reply.empty());
-    QCOMPARE(reply.value("installed").toBool(), installed);
-    if (!available) {
-        QCOMPARE(reply.value("available").toBool(), false);
-    }
-}
-
-void WebappsHandlerTest::testCreateApplicationDesktopName_data()
-{
-    QTest::addColumn<QString>("appName");
-    QTest::addColumn<QString>("appDomain");
-    QTest::addColumn<QString>("expected_uri");
-
-    // Behaviour
-    QTest::newRow("strip whitespace") << "White Space Name" << "example.com" << "application://WhiteSpaceNameexamplecom.desktop";
-    QTest::newRow("strip special chars") << "%$special%^" << "example.com" << "application://specialexamplecom.desktop";
-    QTest::newRow("numbers allowed") << "13monkeys" << "example.com" << "application://13monkeysexamplecom.desktop";
-    QTest::newRow("combined") << "##12combined test$%67" << "example.com" << "application://12combinedtest67examplecom.desktop";
-
-    // Examples
-    QTest::newRow("live example 1") << "FacebookMessanger" << "facebook.com" << "application://FacebookMessangerfacebookcom.desktop";
-    QTest::newRow("live example 2") << "Gmail" << "mail.google.com" << "application://Gmailmailgooglecom.desktop";
-    QTest::newRow("live example 3") << "GooglePlus" << "plus.google.com" << "application://GooglePlusplusgooglecom.desktop";
-}
-
-void WebappsHandlerTest::testCreateApplicationDesktopName()
-{
-    QFETCH(QString, appName);
-    QFETCH(QString, appDomain);
-    QFETCH(QString, expected_uri);
-
-    UnityWebapps::WebappsHandler handler;
-    QCOMPARE(handler.createApplicationDesktopName(appName, appDomain), expected_uri);
-}
-
-QTEST_MAIN(WebappsHandlerTest);
-
-#include "tst_webapps-handler.moc"

=== removed file 'tests/unit/messaging-host/tst_webapps-handler.pro'
--- tests/unit/messaging-host/tst_webapps-handler.pro	2014-06-23 07:32:13 +0000
+++ tests/unit/messaging-host/tst_webapps-handler.pro	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-include(messaging-host.pri)
-
-TARGET = tst_webapps-handler
-
-QMAKE_CXXFLAGS += -std=c++11
-
-CONFIG += \
-    link_pkgconfig \
-    qt
-
-QT += \
-    core \
-    testlib
-
-PKGCONFIG += \
-    glib-2.0 \
-    gobject-2.0 \
-    libunity_webapps-0.2 \
-    libunity-webapps-repository \
-
-DEFINES += UCX_UNDER_TEST
-
-SOURCES += \
-    $${SRC_DIR}/webapps-handler.cpp \
-    tst_webapps-handler.cpp
-
-HEADERS += \
-    $${SRC_DIR}/webapps-handler.h
-
-check.commands = "xvfb-run -s '-screen 0 640x480x24' -a ./$${TARGET}"
-check.depends = $${TARGET}
-QMAKE_EXTRA_TARGETS += check

=== added directory 'tests/unit/messaging-host/webapps-handler'
=== added file 'tests/unit/messaging-host/webapps-handler/CMakeLists.txt'
--- tests/unit/messaging-host/webapps-handler/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/webapps-handler/CMakeLists.txt	2015-10-07 04:25:10 +0000
@@ -0,0 +1,47 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+find_package(PkgConfig)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+
+pkg_check_modules(GLIB glib-2.0 REQUIRED)
+pkg_check_modules(GOBJECT gobject-2.0 REQUIRED)
+pkg_check_modules(WEBAPPS libunity_webapps-0.2)
+pkg_check_modules(WEBAPPS_REPO libunity-webapps-repository)
+
+set(TEST tst_WebappsHandler)
+set(SOURCES
+  ${messaging-host_SOURCE_DIR}/webapps-handler.cpp
+  tst_webapps-handler.cpp
+)
+
+
+include_directories(
+  ${messaging-host_SOURCE_DIR}
+  ${GLIB_INCLUDE_DIRS}
+  ${WEBAPPS_INCLUDE_DIRS}
+  ${WEBAPPS_REPO_INCLUDE_DIRS}
+)
+
+if(DEFINED WEBAPPS_FOUND AND WEBAPPS_FOUND EQUAL 1)
+  if(DEFINED WEBAPPS_REPO_FOUND AND WEBAPPS_REPO_FOUND EQUAL 1)
+    add_definitions(
+      -DHAVE_UNITY_WEBAPPS=1
+      -DUCX_UNDER_TEST=1
+    )
+    add_executable(${TEST} ${SOURCES})
+    target_link_libraries(
+      ${TEST}
+
+      Qt5::Core
+      Qt5::Test
+      ${GLIB_LIBRARIES}
+      ${GOBJECT_LIBRARIES}
+      ${WEBAPPS_LIBRARIES}
+      ${WEBAPPS_REPO_LIBRARIES}
+    )
+    add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)
+  endif()
+endif()

=== added file 'tests/unit/messaging-host/webapps-handler/tst_webapps-handler.cpp'
--- tests/unit/messaging-host/webapps-handler/tst_webapps-handler.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/webapps-handler/tst_webapps-handler.cpp	2015-10-07 04:25:10 +0000
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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/>.
+ */
+
+extern "C" {
+#include <unity-webapps-permissions.h>
+#include <unity-webapps-application-repository.h>
+}
+
+#include "webapps-handler.h"
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTest>
+
+
+// {{{ mock implementations
+struct AppInfo {
+    bool install;
+    bool allowed;
+    bool dontask;
+    UnityWebappsApplicationStatus status;
+    QString name;
+    QString domain;
+};
+
+QMap<QString, AppInfo> _mock_app_info;
+
+UnityWebappsApplicationRepository *unity_webapps_application_repository_new_default()
+{
+    return (UnityWebappsApplicationRepository*)g_object_new(G_TYPE_OBJECT, 0);
+}
+
+gboolean unity_webapps_application_repository_prepare(UnityWebappsApplicationRepository *repository)
+{
+    Q_UNUSED(repository);
+
+    return true;
+}
+
+GList * unity_webapps_application_repository_resolve_url(UnityWebappsApplicationRepository *repository, const gchar *url)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(url))) {
+        return 0;
+    }
+
+    return g_list_append((GList*)0, (gpointer)g_strdup(url));
+}
+
+UnityWebappsApplicationStatus
+unity_webapps_application_repository_get_resolved_application_status(
+    UnityWebappsApplicationRepository *repository,
+    const gchar *application
+)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
+        return UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED;
+    }
+
+    return _mock_app_info.value(QString::fromUtf8(application)).status;
+}
+
+const gchar *
+unity_webapps_application_repository_get_resolved_application_name(UnityWebappsApplicationRepository *repository,
+                                                                    const gchar *application)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
+        return 0;
+    }
+
+    return g_strdup(_mock_app_info.value(QString::fromUtf8(application)).name.toLocal8Bit().constData());
+}
+
+const gchar *
+unity_webapps_application_repository_get_resolved_application_domain(UnityWebappsApplicationRepository *repository,
+																	  const gchar *application)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
+        return 0;
+    }
+
+    return g_strdup(_mock_app_info.value(QString::fromUtf8(application)).domain.toLocal8Bit().constData());
+}
+
+
+gboolean unity_webapps_permissions_get_domain_allowed(const gchar *domain)
+{
+    Q_FOREACH(const QString &key, _mock_app_info.keys()) {
+        AppInfo appInfo = _mock_app_info.value(key);
+        if (appInfo.domain == QLatin1String(domain)) {
+            return appInfo.allowed;
+        }
+    }
+
+    return false;
+}
+
+gboolean unity_webapps_permissions_get_domain_dontask(const gchar *domain)
+{
+    Q_FOREACH(const QString &key, _mock_app_info.keys()) {
+        AppInfo appInfo = _mock_app_info.value(key);
+        if (appInfo.domain == QLatin1String(domain)) {
+            return appInfo.dontask;
+        }
+    }
+
+    return false;
+}
+
+void unity_webapps_permissions_dontask_domain(const gchar *domain)
+{
+    Q_UNUSED(domain);
+}
+
+void
+unity_webapps_application_repository_install_application(UnityWebappsApplicationRepository *repository, const gchar *name,
+														 UnityWebappsApplicationRepositoryInstallCallback callback, gpointer user_data)
+{
+    Q_UNUSED(repository);
+    Q_UNUSED(name);
+    Q_UNUSED(callback);
+    Q_UNUSED(user_data);
+}
+
+// }}}
+
+
+class WebappsHandlerTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebappsHandlerTest();
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+    void testUrlLoadedMalformedRequest();
+    void testUrlLoaded_data();
+    void testUrlLoaded();
+    void testDontAskMalformedRequest();
+    void testDontAsk_data();
+    void testDontAsk();
+    void testInstallMalformedRequest();
+    void testInstall_data();
+    void testInstall();
+    void testCreateApplicationDesktopName_data();
+    void testCreateApplicationDesktopName();
+};
+
+WebappsHandlerTest::WebappsHandlerTest():
+    QObject(0)
+{
+}
+
+
+void WebappsHandlerTest::initTestCase()
+{
+    _mock_app_info.insert("https://mail.google.com/", { true, false, false, UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE, "Gmail", "mail.google.com" });
+    _mock_app_info.insert("http://www.tumblr.com/", { false, true, true, UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE, "Tumblr", "www.tumblr.com" });
+}
+
+void WebappsHandlerTest::cleanupTestCase()
+{
+}
+
+void WebappsHandlerTest::testUrlLoadedMalformedRequest()
+{
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("url_loaded"));
+
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void WebappsHandlerTest::testUrlLoaded_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("available");
+    QTest::addColumn<QString>("appName");
+    QTest::addColumn<QString>("appDomain");
+
+    QTest::newRow("available") << "https://mail.google.com/" << true << "Gmail" << "mail.google.com";
+    QTest::newRow("not_available") << "http://www.example.com/" << false << "None" << "None";
+}
+
+void WebappsHandlerTest::testUrlLoaded()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, available);
+    QFETCH(QString, appName);
+    QFETCH(QString, appDomain);
+
+    QVariantMap message;
+    message.insert("method", QString("url_loaded"));
+    message.insert("url", url);
+
+    UnityWebapps::WebappsHandler handler;
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("available").toBool(), available);
+    if (available) {
+        QCOMPARE(appName, reply.value("appName").toString());
+        QCOMPARE(appDomain, reply.value("appDomain").toString());
+    }
+}
+
+void WebappsHandlerTest::testDontAskMalformedRequest()
+{
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("dont_ask"));
+
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void WebappsHandlerTest::testDontAsk_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("available");
+
+    QTest::newRow("ask") << "https://mail.google.com/" << true;
+    QTest::newRow("dont_ask") << "http://www.tumblr.com/" << true;
+    QTest::newRow("no app") << "http://www.example.com/" << false;
+}
+
+void WebappsHandlerTest::testDontAsk()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, available);
+
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("dont_ask"));
+    message.insert("url", url);
+
+    QVariantMap reply = handler.dont_ask(message);
+
+    QVERIFY(!reply.empty());
+    if (available) {
+        QCOMPARE(reply.value("dont_ask").toBool(), true);
+    } else {
+        QCOMPARE(reply.value("dont_ask").toBool(), false);
+        QCOMPARE(reply.value("available").toBool(), false);
+    }
+}
+
+void WebappsHandlerTest::testInstallMalformedRequest()
+{
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("install"));
+
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void WebappsHandlerTest::testInstall_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("available");
+    QTest::addColumn<bool>("installed");
+
+    QTest::newRow("installs") << "https://mail.google.com/" << true << true;
+    QTest::newRow("wont install") << "http://www.tumblr.com/" << true << false;
+    QTest::newRow("no app") << "http://www.example.com/" << false << false;
+}
+
+void WebappsHandlerTest::testInstall()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, available);
+    QFETCH(bool, installed);
+
+    QVariantMap message;
+    message.insert("method", QString("install"));
+    message.insert("url", url);
+
+    UnityWebapps::WebappsHandler handler;
+    QVariantMap reply = handler.install(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("installed").toBool(), installed);
+    if (!available) {
+        QCOMPARE(reply.value("available").toBool(), false);
+    }
+}
+
+void WebappsHandlerTest::testCreateApplicationDesktopName_data()
+{
+    QTest::addColumn<QString>("appName");
+    QTest::addColumn<QString>("appDomain");
+    QTest::addColumn<QString>("expected_uri");
+
+    // Behaviour
+    QTest::newRow("strip whitespace") << "White Space Name" << "example.com" << "application://WhiteSpaceNameexamplecom.desktop";
+    QTest::newRow("strip special chars") << "%$special%^" << "example.com" << "application://specialexamplecom.desktop";
+    QTest::newRow("numbers allowed") << "13monkeys" << "example.com" << "application://13monkeysexamplecom.desktop";
+    QTest::newRow("combined") << "##12combined test$%67" << "example.com" << "application://12combinedtest67examplecom.desktop";
+
+    // Examples
+    QTest::newRow("live example 1") << "FacebookMessanger" << "facebook.com" << "application://FacebookMessangerfacebookcom.desktop";
+    QTest::newRow("live example 2") << "Gmail" << "mail.google.com" << "application://Gmailmailgooglecom.desktop";
+    QTest::newRow("live example 3") << "GooglePlus" << "plus.google.com" << "application://GooglePlusplusgooglecom.desktop";
+}
+
+void WebappsHandlerTest::testCreateApplicationDesktopName()
+{
+    QFETCH(QString, appName);
+    QFETCH(QString, appDomain);
+    QFETCH(QString, expected_uri);
+
+    UnityWebapps::WebappsHandler handler;
+    QCOMPARE(handler.createApplicationDesktopName(appName, appDomain), expected_uri);
+}
+
+QTEST_MAIN(WebappsHandlerTest);
+
+#include "tst_webapps-handler.moc"

=== removed file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2014-05-20 12:21:50 +0000
+++ tests/unit/unit.pro	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = \
-    messaging-host

=== removed file 'unity-chromium-extension.pro'
--- unity-chromium-extension.pro	2014-05-19 14:04:19 +0000
+++ unity-chromium-extension.pro	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-include(common-project-config.pri)
-include(common-vars.pri)
-
-TEMPLATE = subdirs
-SUBDIRS = \
-    chromium-extension \
-    messaging-host \
-    tests
-
-tests.depends = messaging-host
-
-DISTNAME = $${PROJECT_NAME}-$${PROJECT_VERSION}
-dist.commands = "bzr export $${DISTNAME}.tar.bz2"
-QMAKE_EXTRA_TARGETS += dist