Merge lp:~abreu-alexandre/unity-webapps-qml/port-to-oxide into lp:unity-webapps-qml

[Alexandre Abreu]

Port qml bindings to oxide

Port qml bindings to oxide

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/147/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/port-to-oxide]

136. By Alexandre Abreu on 2014-11-22

Port to oxide

=== modified file 'README'
--- README	2013-06-17 14:46:51 +0000
+++ README	2014-11-22 00:43:58 +0000
@@ -1,1 +1,45 @@
-#
 \ No newline at end of file
+unity-webapps-qml offers a QML component that depending on runtime
+settings and configurations:
+
+- allows one to inject the UbuntuTouch Javascript platform bindings,
+
+- allows one to inject a restricted set of API bindings when running as a webapp
+(see http://developer.ubuntu.com/publish/webapp/packaging-web-apps/),
+
+- allows one to load local javscript snipets that are to be dynamically injected
+in the webview as part of a webapp,
+
+The QML component supports Oxide and QtWebkit as a web engine backend.
+
+= Building =
+
+The build system uses qmake.
+To compile, simply invoke qmake and then make:
+
+    $ qmake .
+    $ make
+
+= Running =
+
+Some examples are being provided in the examples/ folder. Examples range from
+webapp definitions, to api bindings, etc.
+
+= Unit tests =
+
+To run the unit tests, you can use the commands below:
+
+    $ make test
+
+= Automated UI tests =
+
+The unity-webapps-qml component uses autopilot (https://launchpad.net/autopilot) to test its
+internal sub-componenets.
+To run the tests, you will need to install python3-autopilot and libautopilot-qt.
+Then do the following:
+
+    $ cd tests/autopilot/
+    $ autopilot3 run unity_webapps_qml
+
+You can get a list of all available tests with the following command:
+
+    $ autopilot3 list unity_webapps_qml
 
=== modified file 'debian/control'
--- debian/control	2014-10-14 10:02:49 +0000
+++ debian/control	2014-11-22 00:43:58 +0000
@@ -8,7 +8,7 @@
                libnotify-dev,
 # depend on oxide so that we don't build for archs that we can't install on
                liboxideqtcore0,
-               libqt5webkit5-dev,
+               liboxideqt-qmlplugin (>= 1.2.0),
                libunity-action-qt1-dev,
                libunity-dev,
                pkg-config,
@@ -28,8 +28,7 @@
 
 Package: unity-webapps-qml
 Architecture: any
-Depends: qml-module-qtwebkit,
-         liboxideqt-qmlplugin (>= 1.0),
+Depends: liboxideqt-qmlplugin (>= 1.2.0) | qml-module-qtwebkit,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-unity-action-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
 
=== modified file 'examples/api-bindings/alarm/main.qml.in'
--- examples/api-bindings/alarm/main.qml.in	2014-05-08 13:58:56 +0000
+++ examples/api-bindings/alarm/main.qml.in	2014-11-22 00:43:58 +0000
@@ -1,9 +1,9 @@
 import QtQuick 2.0
-import QtWebKit 3.0 
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.UnityWebApps 0.1
 
+
 Item {
   id: root
   focus: true
@@ -16,17 +16,16 @@
     anchors.fill: parent
     url: \"file://$$OUT_PWD/alarm/www/index.html\"
 
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
+    context: WebContext { }
 
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
     }
+  }
 
-    UnityWebApps {
-        id: webapps
-        bindee: webview
-        injectExtraUbuntuApis: true
-    }
+  UnityWebApps {
+    id: webapps
+    bindee: webview
+    injectExtraUbuntuApis: true
   }
 }
 
=== modified file 'examples/api-bindings/content-hub-exporter/main.qml.in'
--- examples/api-bindings/content-hub-exporter/main.qml.in	2014-05-08 13:58:56 +0000
+++ examples/api-bindings/content-hub-exporter/main.qml.in	2014-11-22 00:43:58 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
-import QtWebKit 3.0 
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.UnityWebApps 0.1
 
@@ -16,17 +15,16 @@
     anchors.fill: parent
     url: \"file://$$OUT_PWD/content-hub-exporter/www/index.html\"
 
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
+    context: WebContext { }
 
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
     }
+  }
 
-    UnityWebApps {
-        id: webapps
-        bindee: webview
-        injectExtraUbuntuApis: true
-    }
+  UnityWebApps {
+    id: webapps
+    bindee: webview
+    injectExtraUbuntuApis: true
   }
 }
 
=== modified file 'examples/api-bindings/content-hub/main.qml.in'
--- examples/api-bindings/content-hub/main.qml.in	2014-05-08 13:58:56 +0000
+++ examples/api-bindings/content-hub/main.qml.in	2014-11-22 00:43:58 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
-import QtWebKit 3.0 
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.UnityWebApps 0.1
 
@@ -17,17 +16,16 @@
     anchors.fill: parent
     url: \"file://$$OUT_PWD/content-hub/www/index.html\"
 
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
+    context: WebContext { }
 
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
     }
+  }
 
-    UnityWebApps {
-        id: webapps
-        bindee: webview
-        injectExtraUbuntuApis: true
-    }
+  UnityWebApps {
+    id: webapps
+    bindee: webview
+    injectExtraUbuntuApis: true
   }
 }
 
=== modified file 'examples/api-bindings/content-peer-picker/main.qml.in'
--- examples/api-bindings/content-peer-picker/main.qml.in	2014-05-08 14:21:54 +0000
+++ examples/api-bindings/content-peer-picker/main.qml.in	2014-11-22 00:43:58 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
-import QtWebKit 3.0 
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.UnityWebApps 0.1
 
@@ -17,17 +16,16 @@
     anchors.fill: parent
     url: \"file://$$OUT_PWD/content-peer-picker/www/index.html\"
 
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
+    context: WebContext { }
 
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
     }
+  }
 
-    UnityWebApps {
-        id: webapps
-        bindee: webview
-        injectExtraUbuntuApis: true
-    }
+  UnityWebApps {
+    id: webapps
+    bindee: webview
+    injectExtraUbuntuApis: true
   }
 }
 
=== modified file 'examples/api-bindings/download-manager/main.qml.in'
--- examples/api-bindings/download-manager/main.qml.in	2014-05-13 17:48:43 +0000
+++ examples/api-bindings/download-manager/main.qml.in	2014-11-22 00:43:58 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
-import QtWebKit 3.0 
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.UnityWebApps 0.1
 
@@ -17,17 +16,16 @@
     anchors.fill: parent
     url: \"file://$$OUT_PWD/download-manager/www/index.html\"
 
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
+    context: WebContext { }
 
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
     }
+  }
 
-    UnityWebApps {
-        id: webapps
-        bindee: webview
-	injectExtraUbuntuApis: true
-    }
+  UnityWebApps {
+    id: webapps
+    bindee: webview
+    injectExtraUbuntuApis: true
   }
 }
 
=== modified file 'examples/api-bindings/online-accounts/main.qml.in'
--- examples/api-bindings/online-accounts/main.qml.in	2014-05-08 13:58:56 +0000
+++ examples/api-bindings/online-accounts/main.qml.in	2014-11-22 00:43:58 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
-import QtWebKit 3.0 
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.UnityWebApps 0.1
 
@@ -16,17 +15,16 @@
     anchors.fill: parent
     url: \"file://$$OUT_PWD/online-accounts/www/index.html\"
 
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
+    context: WebContext { }
 
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
     }
+  }
 
-    UnityWebApps {
-        id: webapps
-        bindee: webview
-        injectExtraUbuntuApis: true
-    }
+  UnityWebApps {
+    id: webapps
+    bindee: webview
+    injectExtraUbuntuApis: true
   }
 }
 
=== modified file 'examples/api-bindings/runtime-api/main.qml.in'
--- examples/api-bindings/runtime-api/main.qml.in	2014-03-26 14:38:17 +0000
+++ examples/api-bindings/runtime-api/main.qml.in	2014-11-22 00:43:58 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
-import QtWebKit 3.0 
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.UnityWebApps 0.1
 
@@ -17,16 +16,15 @@
     anchors.fill: parent
     url: \"file://$$OUT_PWD/runtime-api/www/index.html\"
 
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
+    context: WebContext { }
 
     function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview);
     }
+  }
 
-    UnityWebApps {
-        id: webapps
-        bindee: webview
-    }
+  UnityWebApps {
+    id: webapps
+    bindee: webview
   }
 }
 
=== modified file 'examples/basic-webview/main.qml'
--- examples/basic-webview/main.qml	2014-01-17 15:51:27 +0000
+++ examples/basic-webview/main.qml	2014-11-22 00:43:58 +0000
@@ -1,7 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.UnityWebApps 0.1
 
 Window {
@@ -15,36 +14,21 @@
         url: "file:///usr/share/unity-webapps-qml/examples/data/html/big-test.html"
         anchors.fill: parent
 
-        experimental.userScripts: []
-        experimental.preferences.navigatorQtObjectEnabled: true
-        experimental.preferences.developerExtrasEnabled: true
-
-        experimental.userAgent: {
-            return "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
-        }
-        experimental.onMessageReceived: {
-            var msg = null
-            try {
-                msg = JSON.parse(message.data)
-            } catch (error) {
-                console.debug('DEBUG:', message.data)
-                return
-            }
-        }
+        context: WebContext { }
 
         function getUnityWebappsProxies() {
-            var proxies = UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
+            var proxies = UnityWebAppsUtils.makeProxiesForWebViewBindee(webView);
 
             // override the default navigate to request
             proxies.navigateTo = function(url) {};
             return proxies;
         }
+    }
 
-        UnityWebApps {
-            id: webapps
-            name: "BBCNews"
-            bindee: webView
-            model: UnityWebappsAppModel { }
-        }
+    UnityWebApps {
+        id: webapps
+        name: "BBCNews"
+        bindee: webView
+        model: UnityWebappsAppModel { }
     }
 }
 
=== modified file 'examples/examples.pro'
--- examples/examples.pro	2014-01-17 15:51:27 +0000
+++ examples/examples.pro	2014-11-22 00:43:58 +0000
@@ -41,6 +41,9 @@
 basic_webview_install.path = /usr/share/unity-webapps-qml/examples/basic-webview
 basic_webview_install.files = $$system(ls basic-webview/*)
 
+html5_api_bindings_install.path = /usr/share/unity-webapps-qml/examples/api-bindings
+html5_api_bindings_install.files = $$system(ls api-bindings/*)
+
 webapps_apps_model_install.path = /usr/share/unity-webapps-qml/examples/webapps-apps-model
 webapps_apps_model_install.files = $$system(ls webapps-app-model/*)
 
 
=== removed directory 'examples/facebook-share'
=== removed directory 'examples/facebook-share/content-hub'
=== removed file 'examples/facebook-share/content-hub/webapp-facebook.json'
--- examples/facebook-share/content-hub/webapp-facebook.json	2014-06-17 20:34:32 +0000
+++ examples/facebook-share/content-hub/webapp-facebook.json	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-{
-    "share": [
-        "pictures"
-    ]
-}
 
=== removed file 'examples/facebook-share/facebook.png'
 Binary files examples/facebook-share/facebook.png	2014-05-22 08:54:56 +0000 and examples/facebook-share/facebook.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'examples/facebook-share/manifest.json'
--- examples/facebook-share/manifest.json	2014-06-17 20:34:32 +0000
+++ examples/facebook-share/manifest.json	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-{
-    "description": "Facebook (webapp version)",
-    "framework": "ubuntu-sdk-14.10-dev1",
-    "architecture": "all",
-    "hooks": {
-        "webapp-facebook": {
-            "account-application": "webapp-facebook.application",
-            "content-hub": "content-hub/webapp-facebook.json",
-            "account-service": "webapp-facebook.service",
-            "apparmor": "webapp-facebook.json",
-            "desktop": "webapp-facebook.desktop"
-        }
-    },
-    "maintainer": "Webapps Team <[e-mail]>",
-    "name": "com.ubuntu.developer.webapps.webapp-facebook",
-    "title": "webapp-facebook",
-    "version": "1.0.17.4"
-}
 
=== removed directory 'examples/facebook-share/unity-webapps-facebook'
=== removed file 'examples/facebook-share/unity-webapps-facebook/HubSharer.qml'
--- examples/facebook-share/unity-webapps-facebook/HubSharer.qml	2014-06-17 20:49:12 +0000
+++ examples/facebook-share/unity-webapps-facebook/HubSharer.qml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Content 0.1
-
-Item {
-    id: main
-    anchors.fill: parent
-
-    signal completed(string result)
-
-    property string fileToShare
-
-    function _callback(accessToken, fileToShare, message, cb) {
-        print ("_callback: " + accessToken);
-        print ("_callback: " + fileToShare);
-        print ("_callback: " + message);
-
-        itemComp.url = fileToShare;
-        var dataUri = itemComp.toDataURI();
-	var result = {accessToken: accessToken,
-            fileToShare: dataUri.toString(),
-            message: message};
-
-        completed(JSON.stringify(result));
-    }
-
-    ContentItem {
-        id: itemComp
-    }
-
-    Share {
-        anchors.fill: parent
-        visible: true
-        fileToShare: main.fileToShare
-        callback: _callback
-        provider: "facebook"
-        onCanceled: completed(JSON.stringify({status: "cancelled"}))
-        onUploadCompleted: console.log (success)
-        Component.onCompleted: print ("Page completed " + height + " : " + width)
-    }
-}
 
=== removed file 'examples/facebook-share/unity-webapps-facebook/Share.qml'
--- examples/facebook-share/unity-webapps-facebook/Share.qml	2014-06-17 21:18:53 +0000
+++ examples/facebook-share/unity-webapps-facebook/Share.qml	1970-01-01 00:00:00 +0000
@@ -1,323 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program 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 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/>.
- */
-
-import QtQuick 2.0
-import QtQuick.Window 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.OnlineAccounts 0.1
-
-Rectangle {
-    id: root
-    anchors.fill: parent
-    color: Theme.palette.normal.background
-    property string fileToShare
-    property var callback
-    property string serviceType: "webapps"
-    property string provider: "facebook"
-    property string userAccountId
-    property string accessToken
-    property var account
-    signal accountSelected
-    signal canceled()
-    signal uploadCompleted(bool success)
-
-    onUploadCompleted: {
-        activitySpinner.visible = false;
-        if (success)
-            print ("Successfully posted");
-        else
-            print ("Failed to post");
-    }
-
-    AccountServiceModel {
-        id: accounts
-        serviceType: root.serviceType
-        provider: root.provider
-        Component.onCompleted: {
-            if (count == 1) {
-                srv.objectHandle = get(0, "accountServiceHandle");
-            }
-        }
-    }
-
-    AccountService {
-        id: srv
-        onObjectHandleChanged: {
-            root.account = srv;
-            root.account.authenticate(null);
-        }
-        onAuthenticated: {
-            root.userAccountId = accountId;
-            root.accessToken = reply.AccessToken;
-            shareComponent.visible = true;
-            sharemenu.visible = false;
-        }
-    }
-
-
-    Rectangle {
-        id: shareComponent
-        objectName: "shareComponent"
-        anchors.fill: parent
-        color: Theme.palette.normal.background
-        visible: false
-
-        Column {
-            anchors.fill: parent
-            spacing: units.gu(1)
-
-            Item {
-                id: serviceHeader
-                y: 0
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.topMargin: units.gu(1)
-                anchors.leftMargin: units.gu(1)
-                anchors.rightMargin: units.gu(1)
-                height: childrenRect.height
-
-                ListItem.Subtitled {
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                    }
-                    iconName: root.account.provider.iconName
-                    text: root.account.provider.displayName
-                    subText: root.account.displayName
-                    showDivider: false
-                }
-            }
-
-            ListItem.ThinDivider {}
-
-            UbuntuShape {
-                id: messageArea
-                objectName: "messageArea"
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.topMargin: units.gu(1)
-                anchors.leftMargin: units.gu(1)
-                anchors.rightMargin: units.gu(1)
-
-                height: units.gu(20)
-                color: "#f2f2f2"
-
-                TextEdit {
-                    id: message
-                    color: "#333333"
-                    anchors.top: parent.top
-                    anchors.left: snapshot.right
-                    anchors.bottom: parent.bottom
-                    anchors.margins: units.gu(1)
-                    wrapMode: Text.Wrap
-                    width: parent.width - snapshot.width -
-                           snapshot.anchors.margins * 2 -
-                           message.anchors.leftMargin - message.anchors.rightMargin
-                    clip: true
-                    font.pixelSize: FontUtils.sizeToPixels("medium")
-                    font.weight: Font.Light
-                    focus: true
-                }
-
-                ActivityIndicator {
-                    id: activitySpinner
-                    anchors.centerIn: message
-                    visible: false
-                    running: visible
-                }
-
-                UbuntuShape {
-                    id: snapshot
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.margins: units.gu(1)
-                    width: units.gu(10)
-                    height: units.gu(10)
-
-                    image: Image {
-                        source: fileToShare
-                        sourceSize.height: snapshot.height
-                        sourceSize.width: snapshot.width
-                        fillMode: Image.PreserveAspectCrop
-                    }
-                }
-            }
-
-            Item {
-                id: actionsBar
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.topMargin: units.gu(2)
-                anchors.leftMargin: units.gu(1)
-                anchors.rightMargin: units.gu(1)
-                height: childrenRect.height
-
-                Button {
-                    objectName: "cancelButton"
-                    anchors.left: parent.left
-                    text: i18n.dtr("ubuntu-ui-extras", "Cancel")
-                    color: "#cccccc"
-                    width: units.gu(10)
-                    height: units.gu(4)
-                    onClicked: canceled()
-                }
-
-                Button {
-                    objectName: "postButton"
-                    anchors.right: parent.right
-                    anchors.top: parent.top
-                    text: i18n.dtr("ubuntu-ui-extras", "Post")
-                    color: "#dd4814"
-                    width: units.gu(10)
-                    height: units.gu(4)
-                    enabled: !activitySpinner.visible
-                    onClicked: {
-                        activitySpinner.visible = true;
-                        callback(accessToken, fileToShare, message.text, uploadCompleted);
-                    }
-                }
-            }
-
-            UbuntuShape {
-                id: useLocation
-                anchors {
-                    left: parent.left
-                    leftMargin: units.gu(1)
-                    topMargin: units.gu(1)
-                }
-                color: selected ? "#cccccc" : "transparent"
-                property bool selected: false
-                width: units.gu(4.5)
-                height: units.gu(4)
-
-                AbstractButton {
-                    anchors.fill: parent
-                    onClicked: parent.selected = !parent.selected
-                    Image {
-                        source: "assets/icon_location.png"
-                        anchors.centerIn: parent
-                        height: parent.height * 0.75
-                        fillMode: Image.PreserveAspectFit
-                        smooth: true
-                    }
-                }
-            }
-
-            Label {
-                anchors.left: useLocation.right
-                anchors.baseline: useLocation.top
-                anchors.baselineOffset: units.gu(3)
-                anchors.leftMargin: units.gu(1)
-                text: i18n.dtr("ubuntu-ui-extras", "Include location")
-                fontSize: "small"
-            }
-
-        }
-
-        states: [
-            State {
-                name: "landscape-with-keyborad"
-                PropertyChanges {
-                    target: serviceHeader
-                    y: - serviceHeader.height
-                }
-                PropertyChanges {
-                    target: messageArea
-                    height: units.gu(12)
-                }
-            }
-        ]
-
-        state: ((Screen.orientation === Qt.LandscapeOrientation) ||
-                (Screen.orientation === Qt.InvertedLandscapeOrientation)) &&
-               Qt.inputMethod.visible ? "landscape-with-keyborad" : ""
-    }
-
-    /* Menu listing online accounts */
-    Item {
-        id: sharemenu
-        anchors.fill: parent
-        visible: true
-
-        signal selected(string accountId, string token)
-
-        Component.onCompleted: {
-            visible = true;
-        }
-        onSelected: {
-            root.userAccountId = accountId;
-            root.accessToken = token;
-            shareComponent.visible = true;
-            sharemenu.visible = false;
-        }
-
-        Component {
-            id: acctDelegate
-            Item {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                AccountService {
-                    id: service
-                    objectHandle: accountServiceHandle
-                    onAuthenticated: {
-                        sharemenu.selected(accountId, reply.AccessToken);
-                    }
-                }
-
-                height: childrenRect.height
-
-                ListItem.Subtitled {
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                    }
-                    text: service.provider.displayName
-                    subText: displayName
-                    iconName: service.provider.iconName
-                    __iconHeight: units.gu(5)
-                    __iconWidth: units.gu(5)
-
-                    onClicked: {                        
-                        root.account = service;
-                        root.account.authenticate(null);
-                    }
-                }
-            }
-        }
-
-        ListView {
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-            }
-            height: childrenRect.height
-            interactive: false
-            model: accounts
-            header: ListItem.Header {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                text: i18n.tr("Select account")
-            }
-            delegate: acctDelegate
-        }
-    }
-}
 
=== removed directory 'examples/facebook-share/unity-webapps-facebook/assets'
=== removed file 'examples/facebook-share/unity-webapps-facebook/assets/avatar_image.jpg'
 Binary files examples/facebook-share/unity-webapps-facebook/assets/avatar_image.jpg	2014-05-23 10:05:07 +0000 and examples/facebook-share/unity-webapps-facebook/assets/avatar_image.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'examples/facebook-share/unity-webapps-facebook/assets/icon_location.png'
 Binary files examples/facebook-share/unity-webapps-facebook/assets/icon_location.png	2014-05-23 10:05:07 +0000 and examples/facebook-share/unity-webapps-facebook/assets/icon_location.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'examples/facebook-share/unity-webapps-facebook/facebook.user.js'
--- examples/facebook-share/unity-webapps-facebook/facebook.user.js	2014-06-17 20:34:32 +0000
+++ examples/facebook-share/unity-webapps-facebook/facebook.user.js	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-var api = external.getUnityObject('1.0');
-var hub = api.ContentHub;
-var activeTransfer;
-
-function _shareRequested(transfer) {
-    activeTransfer = transfer;
-    transfer.items(function(items) {
-	api.launchEmbeddedUI("HubSharer", upload, {"fileToShare": items[0]});
-    });
-};
-
-hub.onShareRequested(_shareRequested);
-
-function upload(res) {
-    var results = JSON.parse(res);
-    if (results.status == "cancelled")
-        activeTransfer.setState(hub.ContentTransfer.State.Aborted);
-
-    var xhr = new XMLHttpRequest();
-    xhr.open( 'POST', 'https://graph.facebook.com/me/photos?access_token=' + results.accessToken, true );
-    xhr.onload = xhr.onerror = function() {
-        if ( xhr.status == 200 )
-            window.location.reload();
-    };
-
-    var contentType = results.fileToShare.split(',')[0].split(':')[1];
-    var b64data = results.fileToShare.split(',')[1];
-
-    var byteCharacters = atob(b64data);
-    var byteNumbers = new Array(byteCharacters.length);
-    for (var i = 0; i < byteCharacters.length; i++) {
-        byteNumbers[i] = byteCharacters.charCodeAt(i);
-    }
-    var byteArray = new Uint8Array(byteNumbers);
-
-    var div = document.createElement('div');
-    div.innerHTML = '<form enctype="multipart/form-data" method="post" id="uploadForm"><textarea id="message" name="message"></textarea></form>';
-    document.getElementsByTagName('body')[0].appendChild(div);
-
-    var blob = new Blob([byteArray], {type: contentType});
-
-    var uploadForm = document.forms.namedItem("uploadForm");
-    var formData = new FormData(uploadForm);
-    formData.append('source', blob);
-    formData.append('message', results.message);
-    xhr.send(formData);
-}
 
=== removed file 'examples/facebook-share/unity-webapps-facebook/manifest.json'
--- examples/facebook-share/unity-webapps-facebook/manifest.json	2014-05-23 07:42:14 +0000
+++ examples/facebook-share/unity-webapps-facebook/manifest.json	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-{
-    "name": "facebook",
-    "includes": ["https://*.facebook.com/*"],
-    "homepage": "https://m.facebook.com/",
-    "domain": "facebook.com",
-    "scripts": ["facebook.user.js"]
-}
 
=== removed file 'examples/facebook-share/webapp-facebook.application'
--- examples/facebook-share/webapp-facebook.application	2014-05-22 08:54:56 +0000
+++ examples/facebook-share/webapp-facebook.application	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<application id="com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook">
-  <description>Facebook webapp</description>
-
-  <services>
-    <service id="com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook">
-      <description>Use the service in a webapp</description>
-    </service>
-  </services>
-
-</application>
 
=== removed file 'examples/facebook-share/webapp-facebook.desktop'
--- examples/facebook-share/webapp-facebook.desktop	2014-06-17 17:53:45 +0000
+++ examples/facebook-share/webapp-facebook.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Exec=webapp-container --enable-back-forward --webapp='ZmFjZWJvb2s=' --webappModelSearchPath=. --webappUrlPatterns=https?://*.facebook.com/*
-Name=Facebook
-Icon=./facebook.png
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Single-Instance=true
 
=== removed file 'examples/facebook-share/webapp-facebook.json'
--- examples/facebook-share/webapp-facebook.json	2014-05-23 13:00:57 +0000
+++ examples/facebook-share/webapp-facebook.json	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-{
-  "template": "ubuntu-webapp",
-  "policy_groups": [    
-    "networking",
-    "accounts",
-    "audio",
-    "video",
-    "webview",
-    "location",
-    "content_exchange"
-  ],
-  "policy_version": 1.2
-}
 
=== removed file 'examples/facebook-share/webapp-facebook.service'
--- examples/facebook-share/webapp-facebook.service	2014-05-23 13:00:57 +0000
+++ examples/facebook-share/webapp-facebook.service	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service id="com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook">
-  <type>webapps</type>
-  <name>Facebook Webapp</name>
-  <provider>facebook</provider>
-</service>
 
=== modified file 'examples/unity-webapps-example-bbcnews/main.qml'
--- examples/unity-webapps-example-bbcnews/main.qml	2013-07-31 17:27:00 +0000
+++ examples/unity-webapps-example-bbcnews/main.qml	2014-11-22 00:43:58 +0000
@@ -18,8 +18,7 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.UnityWebApps 0.1
 
 Window {
@@ -33,23 +32,19 @@
         width: parent.width
         height: parent.height
 
-        experimental.userScripts: []
-        experimental.preferences.navigatorQtObjectEnabled: true
-        experimental.preferences.developerExtrasEnabled: true
-
-        experimental.userAgent: {
-            return "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
+	context: WebContext {
+	    userAgent: "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
         }
 
         function getUnityWebappsProxies() {
-            return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
+            return UnityWebAppsUtils.makeProxiesForWebViewBindee(webView);
         }
+    }
 
-        UnityWebApps {
-            id: webapps
-            name: "BBCNews"
-            bindee: webView
-            model: UnityWebappsAppModel { searchPath: '/usr/share/unity-webapps-qml/examples/data/userscripts'}
-        }
+    UnityWebApps {
+        id: webapps
+        name: "BBCNews"
+        bindee: webView
+        model: UnityWebappsAppModel { searchPath: '/usr/share/unity-webapps-qml/examples/data/userscripts'}
     }
 }
 
=== modified file 'examples/unity-webapps-example-facebookmessenger/main.qml'
--- examples/unity-webapps-example-facebookmessenger/main.qml	2013-07-31 19:27:51 +0000
+++ examples/unity-webapps-example-facebookmessenger/main.qml	2014-11-22 00:43:58 +0000
@@ -18,8 +18,7 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
+import com.canonical.Oxide 1.0
 import Ubuntu.UnityWebApps 0.1
 
 Window {
@@ -33,19 +32,17 @@
         width: parent.width
         height: parent.height
 
-        experimental.userScripts: []
-        experimental.preferences.navigatorQtObjectEnabled: true
-        experimental.preferences.developerExtrasEnabled: true
+        context: WebContext { }
 
         function getUnityWebappsProxies() {
-            return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
+            return UnityWebAppsUtils.makeProxiesForWebViewBindee(webView);
         }
+    }
 
-        UnityWebApps {
-            id: webapps
-            name: "FacebookMessenger"
-            bindee: webView
-            model: UnityWebappsAppModel { searchPath: '/usr/share/unity-webapps-qml/examples/data/userscripts'}
-        }
+    UnityWebApps {
+        id: webapps
+        name: "FacebookMessenger"
+        bindee: webView
+        model: UnityWebappsAppModel { searchPath: '/usr/share/unity-webapps-qml/examples/data/userscripts'}
     }
 }
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-11-22 00:43:58 +0000
@@ -75,8 +75,7 @@
             var cb = this._onMessageReceivedCallback.bind(self);
             self._bindeeProxies.messageReceivedConnect(cb);
 
-            cb = this._onLoadingStartedCallback.bind(self);
-            self._bindeeProxies.loadingStartedConnect(cb);
+            this._onLoadingStartedCallback();
         },
 
         /**
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-07-18 21:46:57 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-11-22 00:43:58 +0000
@@ -168,17 +168,20 @@
     property string _opt_homepage: ""
 
 
+    /*!
+     \qmlsignal UnityWebApps::userScriptsInjected()
+
+     This signal is emitted when the component has completed its initialization and
+     the userscripts have been injected into the binded webview.
+     */
+    signal userScriptsInjected()
+
+
     Settings {
         id: settings
         injectExtraContentShareCapabilities: name && name.length && name.length !== 0
     }
 
-/*
-    Loader {
-        id: apiBindingModelComponentLoader
-        sourceComponent: settings.injectExtraUbuntuApis ? apiBindingModelComponent : undefined
-    }
-*/
 
     /*!
       \internal
@@ -237,6 +240,8 @@
 
         if (internal.backends)
             internal.instance.setBackends(internal.backends)
+
+        userScriptsInjected();
     }
 
     /*!
@@ -392,7 +397,11 @@
       \internal
 
      */
-    onModelChanged: model.modelContentChanged.connect(__setupNamedWebappEnvironment)
+    onModelChanged: {
+        if (model) {
+            model.modelContentChanged.connect(__setupNamedWebappEnvironment)
+        }
+    }
 
     /*!
       \internal
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-10-08 17:16:47 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-11-22 00:43:58 +0000
@@ -64,7 +64,7 @@
     this.disposer = disposer;
     this.makeSignalDisconnecter = makeSignalDisconnecter;
     this._userScriptInjected = false;
-    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://UnityWebappsApi";
+    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://main-world";
 }
 OxideWebviewAdapter.prototype = {
     injectUserScripts: function(userScriptUrls) {
@@ -79,12 +79,19 @@
 
         for (var i = 0; i < userScriptUrls.length; ++i) {
             var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; Oxide.UserScript { context:";
-            var scriptEnd = "}";
+            var scriptEnd = " }";
             var statement = scriptStart +
-                    '"' + this._WEBAPPS_USER_SCRIPT_CONTEXT + '"' +
-                    '; matchAllFrames: false; url: "' +  userScriptUrls[i] + '";' + scriptEnd;
+                    '"' +
+                    this._WEBAPPS_USER_SCRIPT_CONTEXT +
+                    '"' +
+                    '; matchAllFrames: false; emulateGreasemonkey: true; url: "' +
+                    userScriptUrls[i] +
+                    '";'
+                    + scriptEnd;
+
             context.addUserScript(Qt.createQmlObject(statement, this.webview));
         }
+
         this._userScriptInjected = true;
     },
     sendToPage: function (message) {
 
=== modified file 'src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js'
--- src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js	2014-03-28 13:21:47 +0000
+++ src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js	2014-11-22 00:43:58 +0000
@@ -4,7 +4,7 @@
             navigator.qt.postMessage) {
         return new UnityQtWebkitBackendMessagingProxy();
     }
-    else if (window.oxide) {
+    else if (oxide) {
         return new UnityOxideBackendMessagingProxy();
     }
     return null;
 
=== modified file 'src/Ubuntu/UnityWebApps/unity-webapps-api.js.in'
--- src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-06-04 21:17:00 +0000
+++ src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-11-22 00:43:58 +0000
@@ -1,3 +1,7 @@
+// ==UserScript==
+// @inject_in_main_world
+// ==/UserScript==
+
 /*
  * Copyright 2013 Canonical Ltd.
  *
 
=== modified file 'tests/autopilot/autopilot.pro'
--- tests/autopilot/autopilot.pro	2014-07-14 19:04:25 +0000
+++ tests/autopilot/autopilot.pro	2014-11-22 00:43:58 +0000
@@ -20,7 +20,6 @@
     $$system(ls ./data/*/*) \
     unity_webapps_qml/tests/test_installedWebapp.py \
     unity_webapps_qml/tests/fake_servers.py \
-    qml/WebviewBackendWebkit.qml \
     qml/WebviewBackendOxide.qml \
     qml/message-server.js \
     $$system(ls ./data/installed-webapps/*) \
 
=== modified file 'tests/autopilot/qml/FullWebViewApp.qml'
--- tests/autopilot/qml/FullWebViewApp.qml	2014-07-18 21:46:57 +0000
+++ tests/autopilot/qml/FullWebViewApp.qml	2014-11-22 00:43:58 +0000
@@ -35,21 +35,9 @@
     signal resultUpdated(string message)
 
     function evalInPageUnsafe(expr) {
-        if (webView && webView.experimental) {
-            webView.experimental.evaluateJavaScript(DomIntrospectionUtils.wrapJsCommands(expr),
-                function(result) {
-                    console.log('Result: ' + result);
-                    root.resultUpdated(DomIntrospectionUtils.createResult(result));
-                });
-        }
-        else {
-            root.resultUpdated(DomIntrospectionUtils.createResult(webView.evaluateCode("return navigator.userAgent", true)))
-        }
+        return webView.evaluateCode(expr, true);
     }
 
-    property var webView: null
-
-    property bool useOxide: false
     property string url: ""
 
     property string apiBackendQmlFileUrl: ""
@@ -67,24 +55,14 @@
         active: true
     }
 
-    Loader {
-        id: webviewLoader
-        onLoaded: {
-            webView = webviewLoader.item
-        }
-    }
-
-    Component.onCompleted: {
-        var webviewSource = useOxide ?
-                    Qt.resolvedUrl("WebviewBackendOxide.qml")
-                  : Qt.resolvedUrl("WebviewBackendWebkit.qml");
-        var override =  webappName && webappModel.exists(webappName) ?
-                    webappModel.userAgentOverrideFor(webappName) : ""
-        webviewLoader.setSource(webviewSource,
-            { url: root.url,
-            localUserAgentOverride: override})
-    }
-
+    WebviewBackendOxide {
+        id: webView
+        url: root.url
+        localUserAgentOverride: webappName && webappModel.exists(webappName)
+                                ? webappModel.userAgentOverrideFor(webappName) : ""
+    }
+
+    // Offers a way to override/mock the API backends
     Loader {
         id: apiBackendQmlFileLoader
         source: apiBackendQmlFileUrl.length !== 0 ? apiBackendQmlFileUrl : ""
@@ -93,10 +71,9 @@
     Loader {
         id: unityWebappsComponentLoader
         anchors.fill: parent
-        sourceComponent: webView !== null ?
-                    (apiBackendQmlFileUrl.length !== 0 ?
-                      (apiBackendQmlFileLoader.item ? unityWebappsComponent : undefined)
-                      : unityWebappsComponent) : null
+        sourceComponent: (apiBackendQmlFileUrl.length !== 0
+                            && !apiBackendQmlFileLoader.item)
+                         ? undefined : unityWebappsComponent
     }
 
     UnityWebappsAppModel {
 
=== modified file 'tests/autopilot/qml/WebviewBackendOxide.qml'
--- tests/autopilot/qml/WebviewBackendOxide.qml	2014-07-16 20:15:17 +0000
+++ tests/autopilot/qml/WebviewBackendOxide.qml	2014-11-22 00:43:58 +0000
@@ -9,6 +9,9 @@
 
     property string localUserAgentOverride: ""
 
+    preferences.localStorageEnabled: true
+    preferences.appCacheEnabled: true
+
     function _waitForResult(req, timeout) {
       var result;
       var error;
@@ -46,7 +49,7 @@
     function evaluateCode(code, wrap) {
       var value = webView._waitForResult(
           webView.rootFrame.sendMessage(
-            "webview-oxide://test/",
+            "oxide://main-world",
             "EVALUATE-CODE",
             { code: code,
               wrap: wrap === undefined ? false : wrap }));
@@ -54,10 +57,12 @@
     }
 
     context: Oxide.WebContext {
-        userAgent: webView.localUserAgentOverride.length === 0 ? "" : webView.localUserAgentOverride
+        userAgent: webView.localUserAgentOverride.length === 0
+                   ? "" : webView.localUserAgentOverride
         userScripts: [
             Oxide.UserScript {
-                context: "webview-oxide://test/"
+                context: "oxide://main-world"
+                emulateGreasemonkey: true
                 url: Qt.resolvedUrl("message-server.js")
                 matchAllFrames: true
             }
 
=== removed file 'tests/autopilot/qml/WebviewBackendWebkit.qml'
--- tests/autopilot/qml/WebviewBackendWebkit.qml	2014-07-08 19:27:21 +0000
+++ tests/autopilot/qml/WebviewBackendWebkit.qml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-import QtQuick 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
-import Ubuntu.UnityWebApps 0.1
-
-WebView {
-    id: webView
-    objectName: "webview"
-
-    property string localUserAgentOverride: ""
-
-    experimental.userScripts: []
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.preferences.developerExtrasEnabled: true
-
-    function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
-    }
-}
 
=== modified file 'tests/autopilot/unity_webapps_qml/tests/__init__.py'
--- tests/autopilot/unity_webapps_qml/tests/__init__.py	2014-07-14 19:01:17 +0000
+++ tests/autopilot/unity_webapps_qml/tests/__init__.py	2014-11-22 00:43:58 +0000
@@ -9,29 +9,31 @@
 
 import os
 import os.path
-import shutil
-import tempfile
-import json
 
-from testtools.matchers import Contains, Equals, GreaterThan
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 from unity_webapps_qml.tests import fake_servers
 
-from unity.emulators.unity import Unity
-
-from unity.tests import UnityTestCase
-
-LOCAL_QML_LAUNCHER_APP_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../tools/qml-launcher/unity-webapps-qml-launcher')
+from autopilot.testcase import AutopilotTestCase
+
+LOCAL_QML_LAUNCHER_APP_PATH = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../../../tools/qml-launcher/unity-webapps-qml-launcher')
+
 INSTALLED_QML_LAUNCHER_APP_PATH = 'unity-webapps-qml-launcher'
 
 # TODO create __init__.py.in
-LOCAL_BROWSER_CONTAINER_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../qml/FullWebViewApp.qml')
-INSTALLED_BROWSER_CONTAINER_PATH = '/usr/share/unity-webapps-qml/autopilot-tests/qml/FullWebViewApp.qml'
+LOCAL_BROWSER_CONTAINER_PATH = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../qml/FullWebViewApp.qml')
+
+INSTALLED_BROWSER_CONTAINER_PATH = \
+    '/usr/share/unity-webapps-qml/autopilot-tests/qml/FullWebViewApp.qml'
 
 BASE_URL = ''
 
-class UnityWebappsTestCaseBase(UnityTestCase):
 
+class UnityWebappsTestCaseBase(AutopilotTestCase):
     def setUp(self):
         super(UnityWebappsTestCaseBase, self).setUp()
         self.use_oxide = False
@@ -52,17 +54,18 @@
             return LOCAL_QML_LAUNCHER_APP_PATH
         return INSTALLED_QML_LAUNCHER_APP_PATH
 
-    def get_launch_params(self,
-                          url,
-                          webapp_name='unitywebappsqmllauncher',
-                          webapp_search_path="",
-                          webapp_homepage="",
-                          use_oxide=False,
-                          extra_params=[]):
+    def get_launch_params(
+            self,
+            url,
+            webapp_name='unitywebappsqmllauncher',
+            webapp_search_path="",
+            webapp_homepage="",
+            use_oxide=False,
+            extra_params=[]):
         base_params = ['--qml=' + self.get_qml_browser_container_path(),
-            '--app-id=' + webapp_name,
-            '--webappName=' + webapp_name,
-            '--webappSearchPath=' + webapp_search_path]
+                       '--app-id=' + webapp_name,
+                       '--webappName=' + webapp_name,
+                       '--webappSearchPath=' + webapp_search_path]
 
         if len(webapp_homepage) != 0:
             base_params.append('--webappHomepage=' + webapp_homepage)
@@ -75,8 +78,10 @@
 
         if os.path.exists(LOCAL_QML_LAUNCHER_APP_PATH):
             # we are local
-            base_params.append('--import=' + os.path.join (os.path.dirname(os.path.realpath(__file__)),
-                               '../../../../src'))
+            base_params.append(
+                '--import={}'.format(
+                    os.path.join(os.path.dirname(os.path.realpath(__file__))),
+                    '../../../../src'))
 
         base_params += extra_params
 
@@ -86,18 +91,25 @@
         self.assertThat(os.path.exists(html_filepath), Equals(True))
         url = self.create_file_url(html_filepath)
 
-        self.launch_application(self.get_launch_params(url, 'unitywebappsqmllauncher', '', '', False, extra_params))
+        self.launch_application(
+            self.get_launch_params(
+                url,
+                'unitywebappsqmllauncher',
+                '',
+                '',
+                False,
+                extra_params))
         self.assert_url_eventually_loaded(url)
 
     def launch_application(self, args):
-        print 'Launching test with params:', args, "with", self.get_qml_launcher_path()
-
-        self.app = self.launch_test_application(self.get_qml_launcher_path(),
+        self.app = self.launch_test_application(
+            self.get_qml_launcher_path(),
             *args,
             app_type='qt')
 
         self.webviewContainer = self.get_webviewContainer()
-        self.watcher = self.webviewContainer.watch_signal('resultUpdated(QString)')
+        self.watcher = self.webviewContainer.watch_signal(
+            'resultUpdated(QString)')
 
     def pick_app_launcher(self, app_path):
         # force Qt app introspection:
@@ -121,11 +133,8 @@
 
     def eval_expression_in_page_unsafe(self, expr):
         webview = self.get_webviewContainer()
-        prev_emissions = self.watcher.num_emissions
-        webview.slots.evalInPageUnsafe(expr)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        results = json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])
-        return results.has_key('result') and results['result'] or None
+        return webview.slots.evalInPageUnsafe(expr)
+
 
 class WebappsTestCaseBaseWithLocalHttpContentBase(UnityWebappsTestCaseBase):
     def setUp(self):
@@ -136,5 +145,11 @@
 
     def launch_with_webapp(self, name, webapp_search_path, use_oxide=False):
         self.use_oxide = use_oxide
-        self.launch_application(self.get_launch_params("", name, webapp_search_path, self.base_url, use_oxide))
+        self.launch_application(
+            self.get_launch_params(
+                "",
+                name,
+                webapp_search_path,
+                self.base_url,
+                use_oxide))
         self.assert_url_eventually_loaded(self.base_url)
 
=== modified file 'tests/autopilot/unity_webapps_qml/tests/fake_servers.py'
--- tests/autopilot/unity_webapps_qml/tests/fake_servers.py	2014-07-08 19:27:21 +0000
+++ tests/autopilot/unity_webapps_qml/tests/fake_servers.py	2014-11-22 00:43:58 +0000
@@ -15,12 +15,12 @@
 
 """ Autopilot tests for the unity_webapps_qml package """
 
-import BaseHTTPServer
+import http.server as http
 import logging
 import threading
 
 
-class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class RequestHandler(http.BaseHTTPRequestHandler):
     def serve_content(self, content, mime_type='text/html'):
         self.send_header('Content-type', mime_type)
         self.end_headers()
@@ -51,7 +51,7 @@
 class WebappsQmlContentHttpServer(object):
     def __init__(self):
         super(WebappsQmlContentHttpServer, self).__init__()
-        self.server = BaseHTTPServer.HTTPServer(("", 0), RequestHandler)
+        self.server = http.HTTPServer(("", 0), RequestHandler)
         self.server.allow_reuse_address = True
         self.server_thread = threading.Thread(target=self.server.serve_forever)
         self.server_thread.start()
 
=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_callbackDispatch.py'
--- tests/autopilot/unity_webapps_qml/tests/test_callbackDispatch.py	2014-07-11 17:13:18 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_callbackDispatch.py	2014-11-22 00:43:58 +0000
@@ -7,22 +7,37 @@
 
 from __future__ import absolute_import
 
-import time
 import os
 
-from testtools.matchers import Equals, GreaterThan, NotEquals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from unity_webapps_qml.tests import UnityWebappsTestCaseBase
 
-LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_callback_dispatch.html')
-INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_callback_dispatch.html'
-
-LOCAL_JS_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_callback_dispatch_api.js')
-INSTALLED_JS_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_callback_dispatch_api.js'
-
-LOCAL_QML_BACKEND_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../qml/test_webapps_callback_dispatch_api.qml')
-INSTALLED_QML_BACKEND_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/qml/test_webapps_callback_dispatch_api.qml'
+LOCAL_HTML_TEST_FILE = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_callback_dispatch.html')
+
+INSTALLED_HTML_TEST_FILE = \
+    '/usr/share/unity-webapps-qml/autopilot-tests/' \
+    'html/test_webapps_callback_dispatch.html'
+
+LOCAL_JS_TEST_FILE = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_callback_dispatch_api.js')
+
+INSTALLED_JS_TEST_FILE = \
+    '/usr/share/unity-webapps-qml/autopilot-tests/' \
+    'html/test_webapps_callback_dispatch_api.js'
+
+LOCAL_QML_BACKEND_TEST_FILE = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../qml/test_webapps_callback_dispatch_api.qml')
+
+INSTALLED_QML_BACKEND_TEST_FILE = \
+    '/usr/share/unity-webapps-qml/autopilot-tests/' \
+    'qml/test_webapps_callback_dispatch_api.qml'
+
 
 class WebappsCallbackDispatchTestCaseBase(UnityWebappsTestCaseBase):
     def setUp(self):
@@ -43,7 +58,6 @@
         return INSTALLED_JS_TEST_FILE
 
     def get_qml_test_file(self):
-        print LOCAL_QML_BACKEND_TEST_FILE
         if os.path.exists(LOCAL_QML_BACKEND_TEST_FILE):
             return os.path.abspath(LOCAL_QML_BACKEND_TEST_FILE)
         return INSTALLED_QML_BACKEND_TEST_FILE
@@ -55,6 +69,6 @@
             Eventually(Equals(True)))
 
         self.assertThat(
-            lambda: self.eval_expression_in_page_unsafe("return document.getElementById('content').innerHTML;"),
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('content').innerHTML;"),
             Eventually(Equals('callback-loop-count-reached')))
-
 
=== removed file 'tests/autopilot/unity_webapps_qml/tests/test_hud.py'
--- tests/autopilot/unity_webapps_qml/tests/test_hud.py	2014-04-22 15:40:04 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_hud.py	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2013 Canonical
-#
-# 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.
-
-import os
-import time
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
-from autopilot.matchers import Eventually
-
-from autopilot import platform
-
-from unity.emulators.icons import HudLauncherIcon
-from unity.emulators import ensure_unity_is_running
-
-from unity_webapps_qml.tests import UnityWebappsTestCaseBase
-
-class UnityWebappsHudTestCase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_hud.html')
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_hud.html'
-
-    def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
-
-    def setUp(self):
-        super(UnityWebappsHudTestCase, self).setUp()
-        # On Touch the dbus unity if does is not exposed
-        if platform.model() == 'Desktop':
-            ensure_unity_is_running()
-        self.launch_with_html_filepath(self.get_html_test_file())
-
-    def test_addAction(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('actionadded')))
-
-        self.unity.hud.ensure_visible()
-        self.addCleanup(self.unity.hud.ensure_hidden)
-
-        self.keyboard.type("Hello")
-        self.keyboard.press_and_release("Enter")
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), Eventually(Equals('none')))
-
-    def test_clearAction(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('actionadded')))
-        expr = """
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'clearAction', 'args': ['Hello']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.unity.hud.ensure_visible()
-        self.addCleanup(self.unity.hud.ensure_hidden)
-
-        self.keyboard.type("Hello")
-        self.keyboard.press_and_release("Enter")
-        self.assertThat(self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), NotEquals('none'))
-
-    def test_clearActions(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('actionadded')))
-        expr = """
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'clearActions', 'args': []})});
-           document.dispatchEvent (e);
-           return true;
-        """
-
-        self.eval_expression_in_page_unsafe(expr)
-
-        actions = ['Hello', 'Another action']
-        for action in actions:
-            self.unity.hud.ensure_visible()
-            self.addCleanup(self.unity.hud.ensure_hidden)
-            self.keyboard.type(action)
-            self.keyboard.press_and_release("Enter")
-
-            self.assertThat(self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), NotEquals('none'))
 
=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py'
--- tests/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2014-04-22 15:40:04 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2014-11-22 00:43:58 +0000
@@ -7,51 +7,74 @@
 
 from __future__ import absolute_import
 
-import time
 import os
 
-from testtools.matchers import Equals, GreaterThan, NotEquals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from unity_webapps_qml.tests import UnityWebappsTestCaseBase
 
+LOCAL_HTML_TEST_FILE = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_api_injected.html')
+
+INSTALLED_HTML_TEST_FILE = \
+    '/usr/share/unity-webapps-qml/' \
+    'autopilot-tests/html/test_webapps_api_injected.html'
+
+
 class UnityWebappsApiInjectedTestCaseBase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_api_injected.html')
-
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_api_injected.html'
-
     def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
+        if os.path.exists(LOCAL_HTML_TEST_FILE):
+            return os.path.abspath(LOCAL_HTML_TEST_FILE)
+        return INSTALLED_HTML_TEST_FILE
 
     def setUp(self):
         super(UnityWebappsApiInjectedTestCaseBase, self).setUp()
         self.launch_with_html_filepath(self.get_html_test_file())
 
     def test_getUnityObjectFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null'),
+            Eventually(Equals(True)))
 
     def test_actionsApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var unity = window.external.getUnityObject("1.0");
-            return unity.addAction != null && unity.clearActions != null && unity.clearAction != null;
+            return unity.addAction != null &&
+                   unity.clearActions != null &&
+                   unity.clearAction != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals(True)))
 
     def test_notificationApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var unity = window.external.getUnityObject("1.0");
-            return unity.Notification != null && unity.Notification.showNotification != null;
+            return unity.Notification != null &&
+                   unity.Notification.showNotification != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals(True)))
 
     def test_messagingIndicatorApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var unity = window.external.getUnityObject("1.0");
@@ -61,15 +84,21 @@
                 unity.MessagingIndicator.clearIndicators != null &&
                 unity.MessagingIndicator.showIndicator != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals(True)))
 
     def test_ubuntuReadyEventSent(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
-            var api_ready_count = window.localStorage['ubuntu-webapps-api-ready-key'];
+            var api_ready_count =
+                window.localStorage['ubuntu-webapps-api-ready-key'];
             return api_ready_count != null && api_ready_count > 0;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
-
-
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals(True)))
 
=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py'
--- tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	2014-07-16 20:15:17 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	2014-11-22 00:43:58 +0000
@@ -7,18 +7,23 @@
 
 from __future__ import absolute_import
 
-import time
 import os
 
-from testtools.matchers import Equals, GreaterThan, NotEquals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from unity_webapps_qml.tests import WebappsTestCaseBaseWithLocalHttpContentBase
 
-LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../data')
-INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/data'
-
-class InstalledWebappsTestCaseBase(WebappsTestCaseBaseWithLocalHttpContentBase):
+LOCAL_HTML_TEST_FILE = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../data')
+
+INSTALLED_HTML_TEST_FILE = \
+    '/usr/share/unity-webapps-qml/autopilot-tests/data'
+
+
+class InstalledWebappsTestCaseBase(
+        WebappsTestCaseBaseWithLocalHttpContentBase):
     def setUp(self):
         super(InstalledWebappsTestCaseBase, self).setUp()
 
@@ -30,34 +35,60 @@
     def test_normalWebappFound(self):
         self.launch_with_webapp('Normal', self.get_webapp_install_folder())
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var contentElement = document.getElementById('content');
             return contentElement.innerHTML;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals("WebApp Script Injected")))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals("WebApp Script Injected")))
 
     def test_webappWithUAOverrideFound(self):
-        self.launch_with_webapp('AlteredUAWebapp', self.get_webapp_install_folder(), True)
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return navigator.userAgent;'), Eventually(Equals("My Override")))
+        self.launch_with_webapp(
+            'AlteredUAWebapp',
+            self.get_webapp_install_folder(), True)
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return navigator.userAgent;'),
+            Eventually(Equals("My Override")))
 
     def test_webappFoundWithSpecialWebappPropertiesFile(self):
-        self.launch_with_webapp('ExtendedWebappProperties', self.get_webapp_install_folder() + '/all-in-same-folder')
+        self.launch_with_webapp(
+            'ExtendedWebappProperties',
+            self.get_webapp_install_folder() + '/all-in-same-folder')
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var contentElement = document.getElementById('content');
             return contentElement.innerHTML;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals("WebApp Script Injected")))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals("WebApp Script Injected")))
 
     def test_webappPropertiesFileWithUA(self):
-        self.launch_with_webapp('ExtendedWebappProperties', self.get_webapp_install_folder() + '/all-in-same-folder', True)
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return navigator.userAgent;'), Eventually(Equals("My Override")))
+        self.launch_with_webapp(
+            'ExtendedWebappProperties',
+            self.get_webapp_install_folder() + '/all-in-same-folder', True)
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return navigator.userAgent;'),
+            Eventually(Equals("My Override")))
 
     def test_webappPropertiesNameUpdated(self):
-        self.launch_with_webapp('', self.get_webapp_install_folder() + '/all-in-same-folder')
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
-
+        self.launch_with_webapp(
+            '',
+            self.get_webapp_install_folder() + '/all-in-same-folder')
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_launcher.py'
--- tests/autopilot/unity_webapps_qml/tests/test_launcher.py	2013-09-23 19:59:29 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_launcher.py	2014-11-22 00:43:58 +0000
@@ -6,78 +6,102 @@
 # by the Free Software Foundation.
 
 import os
-import time
-
-from gi.repository import Unity, GObject
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
+
+from gi.repository import Unity
+
+from testtools.matchers import Equals, NotEquals
 from testtools import skipUnless
 
 from autopilot import platform
 from autopilot.matchers import Eventually
 
-from unity.emulators.icons import HudLauncherIcon
-from unity.emulators import ensure_unity_is_running
-
 from unity_webapps_qml.tests import UnityWebappsTestCaseBase
 
+LOCAL_HTML_TEST_FILE = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_launcher.html')
+
+INSTALLED_HTML_TEST_FILE = \
+    '/usr/share/unity-webapps-qml/' \
+    'autopilot-tests/html/test_webapps_launcher.html'
+
+
 class UnityWebappsLauncherTestCase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_launcher.html')
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_launcher.html'
-
     def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
+        if os.path.exists(LOCAL_HTML_TEST_FILE):
+            return os.path.abspath(LOCAL_HTML_TEST_FILE)
+        return INSTALLED_HTML_TEST_FILE
 
     def setUp(self):
         super(UnityWebappsLauncherTestCase, self).setUp()
-        # On Touch the dbus unity if does is not exposed
-        if platform.model() == 'Desktop':
-            ensure_unity_is_running()
         self.launch_with_html_filepath(self.get_html_test_file())
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkCounts(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('launcher-updated')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('launcher-updated')))
 
-        launcher_icon = self.unity.launcher.model.get_icon(desktop_id='unitywebappsqmllauncher.desktop')
+        launcher_icon = self.unity.launcher.model.get_icon(
+            desktop_id='unitywebappsqmllauncher.desktop')
         self.assertThat(launcher_icon, NotEquals(None))
 
         expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
+           document.addEventListener('unity-webapps-do-call-response',
+            function(e) {
                 var response = e.detail;
                 document.getElementById('status').innerHTML = '' + e.detail;
            });
 
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'Launcher.__get', 'with_callback': true, 'args': ['count']})});
+           var e = new CustomEvent (
+                "unity-webapps-do-call",
+                {"detail": JSON.stringify(
+                    {"name": 'Launcher.__get',
+                    'with_callback': true,
+                    'args': ['count']})});
            document.dispatchEvent (e);
            return true;
         """
         self.eval_expression_in_page_unsafe(expr)
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('42')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('42')))
 
         # self.assertThat(launcher.get_property('progress'), Equals(0.09375))
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkProgress(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('launcher-updated')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('launcher-updated')))
 
-        launcher_icon = self.unity.launcher.model.get_icon(desktop_id='unitywebappsqmllauncher.desktop')
+        launcher_icon = self.unity.launcher.model.get_icon(
+            desktop_id='unitywebappsqmllauncher.desktop')
         self.assertThat(launcher_icon, NotEquals(None))
 
         expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
+           document.addEventListener(
+            'unity-webapps-do-call-response', function(e) {
                 var response = e.detail;
                 document.getElementById('status').innerHTML = '' + e.detail;
            });
 
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'Launcher.__get', 'with_callback': true, 'args': ['progress']})});
+           var e = new CustomEvent (
+                "unity-webapps-do-call",
+                {"detail": JSON.stringify(
+                    {"name": 'Launcher.__get',
+                    'with_callback': true,
+                    'args': ['progress']})});
            document.dispatchEvent (e);
            return true;
         """
         self.eval_expression_in_page_unsafe(expr)
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('0.09375')))
-
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('0.09375')))
 
=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py'
--- tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	2013-09-23 19:59:29 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	2014-11-22 00:43:58 +0000
@@ -6,106 +6,153 @@
 # by the Free Software Foundation.
 
 import os
-import time
-
-from gi.repository import Unity, GObject
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
+
+from gi.repository import Unity
+
+from testtools.matchers import Equals
 from testtools import skipUnless
 
 from autopilot import platform
 from autopilot.matchers import Eventually
 
-from unity.emulators import ensure_unity_is_running
-
 from unity_webapps_qml.tests import UnityWebappsTestCaseBase
 
+LOCAL_HTML_TEST_FILE = "{}/{}".format(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_mediaplayer.html')
+
+INSTALLED_HTML_TEST_FILE = \
+    '/usr/share/unity-webapps-qml/' \
+    'autopilot-tests/html/test_webapps_mediaplayer.html'
+
 
 class UnityWebappsMediaplayerTestCase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_mediaplayer.html')
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_mediaplayer.html'
-
     def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
+        if os.path.exists(LOCAL_HTML_TEST_FILE):
+            return os.path.abspath(LOCAL_HTML_TEST_FILE)
+        return INSTALLED_HTML_TEST_FILE
 
     def setUp(self):
         super(UnityWebappsMediaplayerTestCase, self).setUp()
-        # On Touch the dbus unity if does is not exposed
-        if platform.model() == 'Desktop':
-            ensure_unity_is_running()
         self.launch_with_html_filepath(self.get_html_test_file())
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkInitialSetTrack(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('mediaplayer-updated')))
 
         expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
+           document.addEventListener(
+            'unity-webapps-do-call-response',
+            function(e) {
                 var response = e.detail;
                 document.getElementById('status').innerHTML = '' + e.detail;
            });
 
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['track']})});
+           var e = new CustomEvent (
+            "unity-webapps-do-call",
+            {"detail": JSON.stringify(
+                {"name": 'MediaPlayer.__get',
+                'with_callback': true,
+                'args': ['track']})});
            document.dispatchEvent (e);
            return true;
         """
         self.eval_expression_in_page_unsafe(expr)
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('TXlBcnRpc3Q=;TXlUaXRsZQ==;TXlBbGJ1bQ==')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('TXlBcnRpc3Q=;TXlUaXRsZQ==;TXlBbGJ1bQ==')))
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkInitialSetCanGoNext(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('mediaplayer-updated')))
 
         expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
+           document.addEventListener(
+            'unity-webapps-do-call-response', function(e) {
                 var response = e.detail;
                 document.getElementById('status').innerHTML = '' + e.detail;
            });
 
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['can-go-next']})});
+           var e = new CustomEvent (
+            "unity-webapps-do-call",
+            {"detail": JSON.stringify(
+                {"name": 'MediaPlayer.__get',
+                'with_callback': true,
+                'args': ['can-go-next']})});
            document.dispatchEvent (e);
            return true;
         """
         self.eval_expression_in_page_unsafe(expr)
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('true')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('true')))
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkInitialSetCanGoPrevious(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('mediaplayer-updated')))
 
         expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
+           document.addEventListener('unity-webapps-do-call-response',
+            function(e) {
                 var response = e.detail;
                 document.getElementById('status').innerHTML = '' + e.detail;
            });
 
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['can-go-previous']})});
+           var e = new CustomEvent (
+            "unity-webapps-do-call",
+            {"detail": JSON.stringify(
+                {"name": 'MediaPlayer.__get',
+                'with_callback': true,
+                'args': ['can-go-previous']})});
            document.dispatchEvent (e);
            return true;
         """
         self.eval_expression_in_page_unsafe(expr)
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('true')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('true')))
 
     @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
     def test_checkInitialSetCanPlay(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('mediaplayer-updated')))
 
         expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
+           document.addEventListener('unity-webapps-do-call-response',
+            function(e) {
                 var response = e.detail;
                 document.getElementById('status').innerHTML = '' + e.detail;
            });
 
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['can-play']})});
+           var e = new CustomEvent (
+            "unity-webapps-do-call",
+            {"detail": JSON.stringify(
+                {"name": 'MediaPlayer.__get',
+                'with_callback': true,
+                'args': ['can-play']})});
            document.dispatchEvent (e);
            return true;
         """
         self.eval_expression_in_page_unsafe(expr)
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('true')))
-
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('status').innerHTML;"),
+            Eventually(Equals('true')))
 
=== modified file 'tools/qml-launcher/qml-launcher.cpp'
--- tools/qml-launcher/qml-launcher.cpp	2014-07-14 19:01:17 +0000
+++ tools/qml-launcher/qml-launcher.cpp	2014-11-22 00:43:58 +0000
@@ -68,7 +68,6 @@
     const QString QML_FILE_IMPORT_ARG_HEADER = "--import=";
     const QString QML_APP_ID_ARG_HEADER = "--app-id=";
     const QString QML_INSPECTOR_ARG_HEADER = "--inspector=";
-    const QString QML_USE_OXIDE_ARG_HEADER = "--useOxide";
     const QString ARG_HEADER = "--";
     const QString VALUE_HEADER = "=";
     QHash<QString, QString> properties;
@@ -76,7 +75,6 @@
     QString appid;
     QString importPath;
     QString inspector;
-    bool useOxide = false;
     bool maximized = false;
 
     Q_FOREACH(QString argument, app.arguments())
@@ -101,11 +99,6 @@
             inspector = argument.right(argument.count() - QML_INSPECTOR_ARG_HEADER.count());
         }
         else
-        if (argument.contains(QML_USE_OXIDE_ARG_HEADER))
-        {
-            useOxide = true;
-        }
-        else
         if (argument.contains(QML_MAXIMIZED_ARG))
         {
             maximized = true;
@@ -199,9 +192,6 @@
         object->setProperty(it.key().toStdString().c_str(), QUrl(it.value()));
     }
 
-    if (useOxide) {
-        object->setProperty("useOxide", true);
-    }
     component.completeCreate();
 
     if (window)