Merge lp:~abreu-alexandre/unity-webapps-qml/download-api into lp:unity-webapps-qml

[Alexandre Abreu]

Bindings for the download manager

Bindings for the download manager

[Alberto Mardegan (mardy)]

Tested, works fine!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/99/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/47/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/49

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

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/download-api]

102. By Alexandre Abreu on 2014-03-28

Add application api Fixes: 1278485

103. By PS Jenkins bot on 2014-03-28

Releasing 0.1+14.04.20140328-0ubuntu1

104. By Alexandre Abreu on 2014-03-28

Fixes to the runtime-api:

- have inputMethodName return its value,
- have the client register listeners for property changed,

105. By PS Jenkins bot on 2014-03-28

Releasing 0.1+14.04.20140328.1-0ubuntu1

106. By Alexandre Abreu on 2014-04-01

Add some missing files striclty for doc generation for the runtime-api

107. By Alexandre Abreu on 2014-04-01

There is currently an issue on Ubuntu Desktop with webapps running in the container and bamf/unity that when a local desktop file exists (and a webapp icon has been pinned to the launcher through its global /usr/share desktop file), the webapp icons are duplicated in the launcher.

Various fixes have been made to mitigate the issue in bamf but it seems to still be around.

This is voluntarily discarded for now and left around to get to the bottom of the issue in a timely fashion.
 Fixes: 1300864

108. By PS Jenkins bot on 2014-04-01

Releasing 0.1+14.04.20140401.1-0ubuntu1

109. By Alexandre Abreu on 2014-04-07

Update the oxide bits to account for oxide moving to 1.0

110. By PS Jenkins bot on 2014-04-07

Releasing 0.1+14.04.20140407-0ubuntu1

111. By Timo Jyrinki on 2014-04-08

Depend on liboxideqtcore0 to limit archs to be built to the set for which webapps-qml is installable for.

112. By PS Jenkins bot on 2014-04-08

Releasing 0.1+14.04.20140408-0ubuntu1

113. By Ricardo Salveti on 2014-04-30

releasing package unity-webapps-qml version 0.1+14.04.20140408-0ubuntu2

114. By Alexandre Abreu on 2014-05-06

Add UA override capabilities to webapps; clean some code and tests, Fixes: 1245465

115. By PS Jenkins bot on 2014-05-06

Releasing 0.1+14.10.20140506.1-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/10

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

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/download-api]

116. By Alexandre Abreu on 2014-05-14

Cleanup the structure of the QML bindings to make it clearer. No Changes in functionality all features are still working & same,

This is an updated version of: https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml/restructure-cleanup-bindings-qml-structure/+merge/208148 with the latest changes that got in in between Fixes: 1288801

117. By Alexandre Abreu on 2014-05-14

Simplifies the manifest.json handling in some instances. More precisely when one is using a custom model search path for the webapp lookup, some restrictions are being put on what is expected to be found in the folder among which:

- a common/ subfolder (even if the webapp doesnt require one),
- one or more unity-webapps-* folders with manifest.json & *.user.js files in it,

More over the manifest files do require user scripts to be defined.

This imposes a set of constraints over a given webapp that simply wants to use the container (w/o js injection).

This simplifies it an allows one to define a manifest.json file (still with some required elements, but a smaller set), directly in the model search path. E.g. something like:

{
    "name": "MyWebApp",
    "homepage": "http://www.bbc.co.uk/news/",
    "domain": "bbc.co.uk",
    "includes": []
}

will do,

or to avoid any confusion w/ the click manifest.json file, one also searches for a webapp-properties.json w/ the same content as above.

118. By PS Jenkins bot on 2014-05-14

Releasing 0.1+14.10.20140514.2-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/12

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/14

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

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/download-api]

119. By Alexandre Abreu on 2014-05-21

fix AP tests on touch

120. By Alexandre Abreu on 2014-05-21

download ap support; fix ap tests

Unmerged revisions

120. By Alexandre Abreu on 2014-05-21

download ap support; fix ap tests

119. By Alexandre Abreu on 2014-05-21

fix AP tests on touch

=== modified file 'debian/control'
--- debian/control	2014-04-30 01:13:30 +0000
+++ debian/control	2014-05-21 13:06:21 +0000
@@ -37,6 +37,7 @@
          ${misc:Depends},
          ${shlibs:Depends},
 Suggests: qtdeclarative5-ubuntu-content0.1,
+          qtdeclarative5-ubuntu-download-manager0.1
 Description: Unity Webapps QML component
  Unity Webapps QML is a QML component that binds to a QML WebView and allows
  running javascript code to access Ubuntu stack components.

=== added directory 'examples/api-bindings/download-manager'
=== added file 'examples/api-bindings/download-manager/main.qml.in'
--- examples/api-bindings/download-manager/main.qml.in	1970-01-01 00:00:00 +0000
+++ examples/api-bindings/download-manager/main.qml.in	2014-05-21 13:06:21 +0000
@@ -0,0 +1,33 @@
+import QtQuick 2.0
+import QtWebKit 3.0 
+import QtWebKit.experimental 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.UnityWebApps 0.1
+
+MainView {
+  id: root
+  focus: true
+  applicationName: \"helloworld\"
+
+  width: units.gu(100)
+  height: units.gu(100)
+
+  WebView {
+    id: webview
+    anchors.fill: parent
+    url: \"file://$$OUT_PWD/download-manager/www/index.html\"
+
+    experimental.preferences.navigatorQtObjectEnabled: true
+    experimental.preferences.developerExtrasEnabled: true
+
+    function getUnityWebappsProxies() {
+        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+    }
+
+    UnityWebApps {
+        id: webapps
+        bindee: webview
+	injectExtraUbuntuApis: true
+    }
+  }
+}

=== added directory 'examples/api-bindings/download-manager/www'
=== added file 'examples/api-bindings/download-manager/www/index.html'
--- examples/api-bindings/download-manager/www/index.html	1970-01-01 00:00:00 +0000
+++ examples/api-bindings/download-manager/www/index.html	2014-05-21 13:06:21 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <head>
+    <title>Download Api example</title>
+    <script src="./js/app.js"></script>
+  </head>
+
+  <body>
+
+    <div>
+        http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png <input type="button" id="download1"></input>
+    </div>
+
+    <div>
+        http://files.meetup.com/596486/La%20CANADA%20FIRES%20FROM%20CULVER%20CITY%20-%20(10%20MEG%20FILE).jpg <input type="button" id="download2"></input>
+    </div>
+
+    <div>
+      Progress:
+      <span id="progress">0</span>%
+    </div>
+
+    <div>
+      Results:
+      <div id="results">
+      </div>
+    </div>
+
+  </body>
+
+</html>

=== added directory 'examples/api-bindings/download-manager/www/js'
=== added file 'examples/api-bindings/download-manager/www/js/app.js'
--- examples/api-bindings/download-manager/www/js/app.js	1970-01-01 00:00:00 +0000
+++ examples/api-bindings/download-manager/www/js/app.js	2014-05-21 13:06:21 +0000
@@ -0,0 +1,58 @@
+window.onload = function() {
+    var api = external.getUnityObject('1.0');
+
+    document.getElementById('download1').addEventListener('click', function() {
+        api.DownloadApi.downloadFile('http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png'
+                                     , {}
+                                     , function(download) {
+                                         if (download.status === "Success")
+                                             displayImageUri(download.path);
+                                         setResult(JSON.stringify(download.path))
+                                     });
+    });
+
+    document.getElementById('download2').addEventListener('click', function() {
+        api.DownloadApi.createDownloadManager({}, function(manager) {
+            manager.downloadsChanged(function(downloads) {
+                if (downloads && downloads.length !== 0) {
+                    setResult('Downloading a 10 MB image');
+                    downloads[0].progressChanged(function(progress) {
+                        setProgress(progress);
+                    });
+                    downloads[0].finished(function(path) {
+                        displayImageUri(path);
+                        downloads[0].destroy();
+                    });
+                    downloads[0].canceled(function() {
+                        setResults('Download opertaion cancelled');
+                    });
+                    downloads[0].start();
+                }
+            });
+            manager.download("http://files.meetup.com/596486/La%20CANADA%20FIRES%20FROM%20CULVER%20CITY%20-%20(10%20MEG%20FILE).jpg");
+        });
+    });
+
+    function displayImageUri(image) {
+        var res = document.getElementById('results');
+
+        var img = document.createElement('img');
+
+        img.setAttribute('src', image);
+        img.setAttribute('height', '100px');
+        img.setAttribute('width', '100px');
+
+        res.appendChild(img);
+    };
+
+    function setResult(results) {
+        var resultEl = document.getElementById('results');
+        resultEl.innerHTML += results + '<br>';
+    };
+
+    function setProgress(progress) {
+        var resultEl = document.getElementById('progress');
+        resultEl.innerHTML = progress;
+    };
+};
+

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.pro'
--- src/Ubuntu/UnityWebApps/UnityWebApps.pro	2014-05-08 13:01:07 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.pro	2014-05-21 13:06:21 +0000
@@ -68,11 +68,15 @@
 runtime_api_binding_backend_js_files.path = $$installPath/bindings/runtime-api/backend/
 runtime_api_binding_backend_js_files.files = ./bindings/runtime-api/backend/runtime-api.js
 
+download_api_binding_backend_js_files.path = $$installPath/bindings/download-manager/backend/
+download_api_binding_backend_js_files.files = ./bindings/download-manager/backend/download-api.js
+
 INSTALLS += qmldir_file \
     qml_files \
     js_files \
     content_hub_binding_backend_js_files \
     alarm_binding_backend_js_files \
     online_accounts_binding_backend_js_files \
-    runtime_api_binding_backend_js_files
+    runtime_api_binding_backend_js_files \
+    download_api_binding_backend_js_files
 

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-05-08 13:58:56 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-05-21 13:06:21 +0000
@@ -26,6 +26,7 @@
 import "./bindings/alarm-api/backend/alarm-api.js" as AlarmApiBackend
 import "./bindings/content-hub/backend/content-hub.js" as ContentHubApiBackend
 import "./bindings/online-accounts/backend/online-accounts.js" as OnlineAccountsApiBackend
+import "./bindings/download-manager/backend/download-api.js" as DownloadApiBackend
 
 
 /*!
@@ -656,6 +657,10 @@
                 return RuntimeApiBackend.createRuntimeApi(UnityBackends.backendDelegate)
             }),
 
+            DownloadApi:  __injectResourceIfExtraApisAreEnabled(function() {
+                return DownloadApiBackend.createDownloadApi(UnityBackends.backendDelegate)
+            }),
+
             Launcher: {
                 setCount: function (count) {
                     if (!initialized)

=== added directory 'src/Ubuntu/UnityWebApps/bindings/download-manager'
=== added directory 'src/Ubuntu/UnityWebApps/bindings/download-manager/backend'
=== added file 'src/Ubuntu/UnityWebApps/bindings/download-manager/backend/download-api.js'
--- src/Ubuntu/UnityWebApps/bindings/download-manager/backend/download-api.js	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/bindings/download-manager/backend/download-api.js	2014-05-21 13:06:21 +0000
@@ -0,0 +1,392 @@
+/**
+ *
+ * Download API backend binding
+ *
+ */
+function createDownloadApi(backendDelegate) {
+    var PLUGIN_URI = 'Ubuntu.DownloadManager';
+    var VERSION = 0.1;
+
+    function SingleDownload(singledownload, objectid) {
+        var id = objectid;
+        if ( ! singledownload) {
+            var result = backendDelegate.createQmlObject(
+                        PLUGIN_URI, VERSION, 'SingleDownload');
+            id = result.id;
+            singledownload = result.object;
+        }
+        if ( ! id) {
+            id = backendDelegate.storeQmlObject(singledownload,
+                    PLUGIN_URI, VERSION, 'SingleDownload');
+        }
+
+        this._id = id;
+        this._object = singledownload;
+    };
+    SingleDownload.prototype = {
+        _validate: function() {
+            if (! this._object)
+                throw new TypeError("Invalid object null");
+        },
+
+        destroy: function() {
+            if (! this._object)
+                return;
+            this._object.destroy();
+            backendDelegate.deleteId(this._id);
+        },
+
+        // object methods
+        serialize: function() {
+            return {
+                type: 'object-proxy',
+                apiid: 'DownloadApi',
+                objecttype: 'SingleDownload',
+                objectid: this._id,
+            }
+        },
+
+        // methods
+
+        cancel: function() {
+            this._validate();
+            this._object.cancel();
+        },
+        start: function() {
+            this._validate();
+            this._object.start();
+        },
+        pause: function() {
+            this._validate();
+            this._object.pause();
+        },
+        resume: function() {
+            this._validate();
+            this._object.resume();
+        },
+        download: function(url) {
+            this._validate();
+            this._object.download(url);
+        },
+
+
+        // properties
+        autoStart: function(callback) {
+            this._validate();
+            callback(this._object.autoStart);
+        },
+        setAutoStart: function(shouldAutoStart, callback) {
+            this._validate();
+            this._object.autoStart = shouldAutoStart;
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
+        allowMobileDownload: function(callback) {
+            this._validate();
+            callback(this._object.allowMobileDownload);
+        },
+        setAllowMobileDownload: function(allow, callback) {
+            this._validate();
+            this._object.allowMobileDownload = allow;
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
+        isCompleted: function(callback) {
+            this._validate();
+            callback(this._object.isCompleted);
+        },
+        isCompletedChanged: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var self = this;
+                this._object.isCompletedChanged.connect(function() {
+                    callback(self._object.isCompleted);
+                });
+            }
+        },
+
+        downloadInProgress: function(callback) {
+            this._validate();
+            callback(this._object.downloadInProgress);
+        },
+        downloadInProgressChanged: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var self = this;
+                this._object.downloadInProgressChanged.connect(function() {
+                    callback(self._object.downloadInProgress);
+                });
+            }
+        },
+
+        progress: function(callback) {
+            this._validate();
+            callback(this._object.progress);
+        },
+        progressChanged: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var self = this;
+                this._object.progressChanged.connect(function() {
+                    callback(self._object.progress);
+                });
+            }
+        },
+
+        downloading: function(callback) {
+            this._validate();
+            callback(this._object.downloading);
+        },
+        downloadingChanged: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var self = this;
+                this._object.downloadingChanged.connect(function() {
+                    callback(self._object.downloading);
+                });
+            }
+        },
+
+        errorMessage: function(callback) {
+            this._validate();
+            callback(this._object.errorMessage);
+        },
+        errorChanged: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var self = this;
+                this._object.errorChanged.connect(function() {
+                    callback(self._object.errorMessage);
+                });
+            }
+        },
+
+        finished: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                this._object.finished.connect(callback);
+            }
+        },
+
+        canceled: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                this._object.canceled.connect(callback);
+            }
+        },
+
+        paused: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                this._object.paused.connect(callback);
+            }
+        },
+
+        // internal
+
+        internal: {
+            error: function(self) {
+                return self._object.error;
+            }
+        }
+    };
+
+    function DownloadManager(downloadManager, objectid) {
+        var id = objectid;
+        if ( ! downloadManager) {
+            var result = backendDelegate.createQmlObject(
+                        PLUGIN_URI, VERSION, 'DownloadManager');
+            id = result.id;
+            downloadManager = result.object;
+        }
+        if ( ! id) {
+            id = backendDelegate.storeQmlObject(downloadManager,
+                    PLUGIN_URI, VERSION, 'DownloadManager');
+        }
+
+        this._id = id;
+        this._object = downloadManager;
+    };
+    DownloadManager.prototype = {
+        _validate: function() {
+            if (! this._object)
+                throw new TypeError("Invalid object null");
+        },
+
+        destroy: function() {
+            if (! this._object)
+                return;
+            this._object.destroy();
+            backendDelegate.deleteId(this._id);
+        },
+
+        // object methods
+        serialize: function() {
+            return {
+                type: 'object-proxy',
+                apiid: 'DownloadApi',
+                objecttype: 'DownloadManager',
+                objectid: this._id,
+            }
+        },
+
+        // methods
+        download: function(url) {
+            this._validate();
+            this._object.download(url);
+        },
+
+        // properties
+        autoStart: function(callback) {
+            this._validate();
+            callback(this._object.autoStart);
+        },
+        setAutoStart: function(shouldAutoStart, callback) {
+            this._validate();
+            this._object.autoStart = shouldAutoStart;
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
+        cleanDownloads: function(callback) {
+            this._validate();
+            callback(this._object.cleanDownloads);
+        },
+        setCleanDownloads: function(clean, callback) {
+            this._validate();
+            this._object.cleanDownloads = clean;
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
+        errorMessage: function(callback) {
+            this._validate();
+            callback(this._object.errorMessage);
+        },
+        errorChanged: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var self = this;
+                this._object.errorChanged.connect(function() {
+                    callback(self._object.errorMessage);
+                });
+            }
+        },
+
+        downloads: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var downloadCount = this._object.downloads.length;
+                var downloads = [];
+                for (var i = 0; i < downloadCount; ++i) {
+                    var download =
+                        new SingleDownload(this._object.downloads[i]);
+                    downloads.push(download.serialize());
+                }
+                callback(downloads);
+            }
+        },
+        downloadsChanged: function(callback) {
+            this._validate();
+            if (callback && typeof(callback) === 'function') {
+                var self = this;
+                this._object.downloadsChanged.connect(function() {
+                    self.downloads(callback);
+                });
+            }
+        },
+    };
+
+    function _constructorFromName(className) {
+        var constructorPerName = {
+            "SingleDownload": SingleDownload,
+            "DownloadManager": DownloadManager,
+        };
+        return className in constructorPerName
+                ? constructorPerName[className]
+                : null;
+    }
+
+    return {
+        createDownloadManager: function(options, callback) {
+            if (! callback || typeof callback !== 'function')
+                return;
+
+            var autoStart =
+                    options && options.autoStart === undefined
+                        ? false : options.autoStart;
+            var cleanDownloads =
+                    options && options.cleanDownloads === undefined
+                        ? false : options.cleanDownloads;
+
+            var manager = new DownloadManager();
+            manager.setAutoStart(autoStart);
+            manager.setCleanDownloads(cleanDownloads);
+
+            callback(manager.serialize());
+        },
+
+        downloadFile: function(url, options, onCompleted, onProgress, onError) {
+            var download = new SingleDownload();
+
+            var allowMobileDownload =
+                    options && options.allowMobileDownload === undefined ? false : options.allowMobileDownload;
+            var throttle =
+                    options && options.throttle ? options.throttle : undefined;
+
+            if (allowMobileDownload === true)
+                download.setAllowMobileDownload(allowMobileDownload);
+
+            if (throttle !== undefined)
+                download.setThrottle(throttle);
+
+            if (onProgress && typeof onProgress === 'function') {
+                download.progressChanged(onProgress);
+            }
+
+            if (onError && typeof onError === 'function') {
+                download.errorChanged(onError);
+            }
+
+            if (onCompleted && typeof onCompleted === 'function') {
+                download.finished(function(path) {
+                    onCompleted({status: "Success", path: path, download: download.serialize()})
+                });
+                download.canceled(function(success) {
+                    onCompleted({status: "Cancelled", download: download.serialize()})
+                });
+            }
+
+            download.setAutoStart(true);
+            download.download(url);
+        },
+
+
+        // Internal
+
+        dispatchToObject: function(infos) {
+            var args = infos.args;
+            var callback = infos.callback;
+            var method_name = infos.method_name;
+            var objectid = infos.objectid;
+            var class_name = infos.class_name;
+
+            if (callback)
+                args.push(callback);
+
+            var o = backendDelegate.objectFromId(objectid);
+            if (o == null) {
+                console.debug('Cannot dispatch to unknown object: ' + objectid);
+                return;
+            }
+
+            var Constructor = _constructorFromName(class_name);
+
+            var instance = new Constructor(o, objectid);
+
+            instance[method_name].apply(instance, args);
+        }
+    };
+}

=== added directory 'src/Ubuntu/UnityWebApps/bindings/download-manager/client'
=== added file 'src/Ubuntu/UnityWebApps/bindings/download-manager/client/download-api.js'
--- src/Ubuntu/UnityWebApps/bindings/download-manager/client/download-api.js	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/bindings/download-manager/client/download-api.js	2014-05-21 13:06:21 +0000
@@ -0,0 +1,457 @@
+/**
+ * DownloadApi gives access to Download management.
+
+ * @module DownloadApi
+ */
+function createDownloadApi(backendBridge) {
+    var PLUGIN_URI = 'DownloadApi';
+
+/**
+ * SingleDownload provides facilities for downloading a single
+ *   file, track the process, react to error conditions, etc.
+ *
+ * @class SingleDownload
+ * @constructor
+ * @example
+
+ */
+    function SingleDownload(id) {
+        this._proxy = backendBridge.createRemoteObject(
+            PLUGIN_URI, 'SingleDownload', id);
+    };
+    SingleDownload.prototype = {
+
+        /**
+         * This property retrieves if the downloads should start automatically, or let the user
+         * decide when to start them calling the "start()" method on each download.
+         *
+         * @method autoStart
+         * @param callback {Function(Error)}
+         */
+        autoStart: function(callback) {
+            this._proxy.call('autoStart', [], callback);
+        },
+        /**
+         * This property sets if the downloads should start automatically, or let the user
+         * decide when to start them calling the "start()" method on each download.
+         *
+         * @method setAutoStart
+         * @param shouldAutoStart {Bool}
+         * @param callback (optional) {Function()} To be called after the value is set.
+         */
+        setAutoStart: function(shouldAutoStart, callback) {
+            this._proxy.call('setAutoStart', [shouldAutoStart], callback);
+        },
+
+        /**
+         * Retrieves the current error message (if any)
+         *
+         * @method errorMessage
+         * @param callback {Function(String)} Called with the current error message.
+         */
+        errorMessage: function(callback) {
+            this._proxy.call('errorMessage', [], callback);
+        },
+        /**
+         * Sets up a callback that is to be called when error message changes.
+         *
+         * @method errorChanged
+         * @param callback {Function(String)} Called with the current error message.
+         */
+        errorChanged: function(callback) {
+            this._proxy.call('errorChanged', [callback]);
+        },
+
+        /**
+         * Retrieves the property that determines if the download handled by this object
+         * will work under mobile data connection.
+         *
+         * @method allowMobileDownload
+         * @param callback {Function(Bool)} Called with the current value.
+         */
+        allowMobileDownload: function(callback) {
+            this._proxy.call('allowMobileDownload', [], callback);
+        },
+        /**
+         * Sets the property that determines if the download handled by this object
+         * will work under mobile data connection.
+         *
+         * @method setAllowMobileDownload
+         * @param allow {Bool}
+         * @param callback (optional) {Function()} Called after the value has been set.
+         */
+        setAllowMobileDownload: function(allow, callback) {
+            this._proxy.call('setAllowMobileDownload', [allow], callback);
+        },
+
+        /**
+         * Retrieves the current state of the download. True if the download already finished, False otherwise.
+         *
+         * @method isCompleted
+         * @param callback {Function(Bool)} Called with the current value.
+         */
+        isCompleted: function(callback) {
+            this._proxy.call('isCompleted', [], callback);
+        },
+        /**
+         * Sets up a callback that is to be called when the download completion status changes.
+         *
+         * @method isCompletedChanged
+         * @param callback {Function(Bool)} Function to be called when the download completion status changes. Called with a boolean corresponding to the current value.
+         */
+        isCompletedChanged: function(callback) {
+            this._proxy.call('isCompletedChanged', [callback]);
+        },
+
+        /**
+         * Retrieves the property that indicates if the download is active whatever its internal status is (paused etc.).
+         * If a download is active, the value will be True. It will become False when the download
+         * finished or get canceled.
+         *
+         * @method downloadInProgress
+         * @param callback {Function(Bool)} Called with the current value.
+         */
+        downloadInProgress: function(callback) {
+            this._proxy.call('downloadInProgress', [], callback);
+        },
+        /**
+         * Sets up a callback that is to be called when the download progress status changes.
+         *
+         * @method downloadInProgressChanged
+         * @param callback {Function(Bool)} Function to be called when the downloading progress status changes. Called with a boolean corresponding to the current value.
+         */
+        downloadInProgressChanged: function(callback) {
+            this._proxy.call('downloadInProgressChanged', [callback]);
+        },
+
+        /**
+         * Retrieves the property that reports the current progress in percentage of the download, from 0 to 100.
+         *
+         * @method progress
+         * @param callback {Function(Int)} Called with the current value.
+         */
+        progress: function(callback) {
+            this._proxy.call('progress', [], callback);
+        },
+        /**
+         * Sets up a callback that is to be called when the progress value changes.
+         *
+         * @method progressChanged
+         * @param callback {Function(Int)} Function to be called when the progress value changes. Called with the current value.
+         */
+        progressChanged: function(callback) {
+            this._proxy.call('progressChanged', [callback]);
+        },
+
+        /**
+         * Retrieves the property that represents the current state of the download.
+         * False if paused or not downloading anything.
+         * True if the file is currently being downloaded.
+         *
+         * @method downloading
+         * @param callback {Function(Bool)} Called with the current value.
+         */
+        downloading: function(callback) {
+            this._proxy.call('downloading', [], callback);
+        },
+        /**
+         * Sets up a callback that is to be called when the downloading status changes.
+         *
+         * @method progressChanged
+         * @param callback {Function(Bool)} Function to be called when the downloading status changes. Called with the current value.
+         */
+        downloadingChanged: function(callback) {
+            this._proxy.call('downloadingChanged', [callback]);
+        },
+
+        /**
+         * Sets up a callback that is to be called when the download is finished.
+         *
+         * @method finished
+         * @param callback {Function(String)} Function to be called when the download is finished. Called with a the path of the downloaded file.
+         */
+        finished: function(callback) {
+            this._proxy.call('finished', [callback]);
+        },
+
+        /**
+         * Sets up a callback that is to be called when the download is canceled.
+         *
+         * @method canceled
+         * @param callback {Function(Bool)} Function to be called when the download is canceled. Called with a boolean indicating if the operation was successful.
+         */
+        canceled: function(callback) {
+            this._proxy.call('canceled', [callback]);
+        },
+
+        /**
+         * Sets up a callback that is to be called when the download is paused.
+         *
+         * @method paused
+         * @param callback {Function(Bool)} Function to be called when the download is paused. Called with a boolean indicating if the operation was successful.
+         */
+        paused: function(callback) {
+            this._proxy.call('paused', [callback]);
+        },
+
+        /**
+         * Starts a download.
+         *
+         * @method start
+         */
+        start: function() {
+            this._proxy.call('start', []);
+        },
+
+        /**
+         * Pauses a download.
+         *
+         * @method pause
+         */
+        pause: function() {
+            this._proxy.call('pause', []);
+        },
+
+        /**
+         * Resumes a download.
+         *
+         * @method resume
+         */
+        resume: function() {
+            this._proxy.call('resume', []);
+        },
+
+        /**
+         * Cancels a download.
+         *
+         * @method cancel
+         */
+        cancel: function() {
+            this._proxy.call('cancel', []);
+        },
+
+        /**
+         * Downloads a given item by url.
+         *
+         * @method download
+         * @param url {String} Url of the file to download.
+         */
+        download: function(url) {
+            this._proxy.call('download', []);
+        },
+
+        // extras
+
+        /**
+         * Destroys the remote object. This proxy object is not valid anymore.
+         *
+         * @method destroy
+         */
+        destroy: function() {
+            this._proxy.call('destroy', []);
+        },
+    };
+
+
+    /**
+     * DownloadManager provides facilities for downloading a several
+     * files, list the current downloads in progress or finished,
+     * and dynamically update the content of those to show the current
+     * downloads.
+.    *
+     * @class DownloadManager
+     * @constructor
+     * @example
+     *
+     */
+    function DownloadManager(id) {
+        this._proxy = backendBridge.createRemoteObject(
+            PLUGIN_URI, 'DownloadManager', id);
+    };
+    DownloadManager.prototype = {
+
+        /**
+         * This property sets if the downloads should start automatically, or let the user
+         * decide when to start them calling the "start()" method on each download object.
+         *
+         * @method autoStart
+         * @param callback {Function(Error)}
+         */
+        autoStart: function(callback) {
+            this._proxy.call('autoStart', [], callback);
+        },
+        /**
+         * This property sets if the downloads should start automatically, or let the user
+         * decide when to start them calling the "start()" method on each download object.
+         *
+         * @method setAutoStart
+         * @param shouldAutoStart {Bool}
+         * @param callback (optional) {Function()} To be called after the value is set.
+         */
+        setAutoStart: function(shouldAutoStart, callback) {
+            this._proxy.call('setAutoStart', [shouldAutoStart], callback);
+        },
+
+        /**
+         * Retrieves the clean download flag value.
+         *
+         * @method cleanDownloads
+         * @param callback {Function(Bool)} Called with the current value of the clean download flag
+         */
+        cleanDownloads: function(callback) {
+            this._proxy.call('cleanDownloads', [], callback);
+        },
+        /**
+         * Sets the value of the clean download flag. This informs the download manager that
+         * the list of SingleDownload listed by the 'downloads' property should only contain
+         * the downloads in progress. Those that finishes are being removed from the list.
+         *
+         * @method setCleanDownloads
+         * @param clean {Bool}
+         * @param callback (optional) {Function()} To be called after the value is set.
+         */
+        setCleanDownloads: function(clean, callback) {
+            this._proxy.call('setCleanDownloads', [clean], callback);
+        },
+
+        /**
+         * Retrieves the current error message (if any)
+         *
+         * @method errorMessage
+         * @param callback {Function(String)} Called with the current error message.
+         */
+        errorMessage: function(callback) {
+            this._proxy.call('errorMessage', [], callback);
+        },
+        /**
+         * Sets up a callback that is to be called when error message changes.
+         *
+         * @method errorChanged
+         * @param callback {Function(String)} Called with the current error message.
+         */
+        errorChanged: function(callback) {
+            this._proxy.call('errorChanged', [callback]);
+        },
+
+        /**
+         * Retrieves the current set of download being proceeded.
+         *
+         * @method downloads
+         * @param callback {Function(List of SingleDownload)} Called with the current set of download objects.
+         */
+        downloads: function(callback) {
+            this._proxy.call('downloads', [], callback);
+        },
+        /**
+         * Sets up a callback that is to be called when the set of urls being downloaded
+         * changes (items being added or removed).
+         *
+         * @method downloadsChanged
+         * @param callback {Function(List of SingleDownload)} Called with the current set of download objects.
+         */
+        downloadsChanged: function(callback) {
+            this._proxy.call('downloadsChanged', [callback]);
+        },
+
+        /**
+         * Starts a download operation for the given url.
+         *
+         * @method download
+         * @param url {String}
+         */
+        download: function(url) {
+            this._proxy.call('download', [url]);
+        },
+
+        // extras
+
+        /**
+         * Destroys the remote object. This proxy object is not valid anymore.
+         *
+         * @method destroy
+         */
+        destroy: function() {
+            this._proxy.call('destroy', []);
+        },
+    };
+
+    function _constructorFromName(className) {
+        var constructorPerName = {
+            "SingleDownload": SingleDownload,
+            "DownloadManager": DownloadManager,
+        };
+        return className in constructorPerName
+                ? constructorPerName[className]
+                : null;
+    };
+
+/**
+ * The DownloadApi object
+
+ * @class DownloadApi
+ * @constructor
+ * @example
+
+ */
+    return {
+
+        /**
+         * Creates a download manager object.
+         *
+         * @method createDownloadManager
+         * @param options {Object} A dictionary of download options. The option keys are:
+         *  - autoStart: This property sets if the downloads should start automatically, or let the user
+         *          decide when to start them calling the "start()" method on each download.
+         *  - cleanDownloads: This informs the download manager that the list of SingleDownload listed by
+         *          the 'downloads' property should only contain the downloads in progress. Those that
+         *          finishes are being removed from the list
+         * @param callback {Function(DownloadManager)} Function called with the DownloadManager object created.
+         */
+        createDownloadManager: function(options, callback) {
+            backendBridge.call('DownloadApi.createDownloadManager'
+                               , [options]
+                               , callback);
+        },
+
+        /**
+         * Download a file.
+         *
+         * @method downloadFile
+         * @param url {String} Function called with the created Alarm.
+         * @param options {Object} A dictionary of download options. The option keys are:
+         *  - allowMobileDownload:
+         *  - throttle:
+         * @param onCompleted {Function(Object)} Function called when the download completes. The function is called with an dictionary with the following keys:
+         *  - status: status of the download ("Success" or "Cancelled")
+         *  - path: path of the downloaded resource
+         *  - download: SingleDownload object that performed the download (so that it can be inspected & destroyed)
+         * @param onProgress {Function(Float)} (optional) Function called with current progress.
+         * @param onError {Function(String)} (optional) Function called when an error occurs with the error message.
+         *  - error:
+         *  - downloads:
+         */
+        downloadFile: function(url, options, onCompleted, onProgress, onError) {
+            if ( ! onCompleted || typeof onCompleted !== 'function')
+                throw Error("Invalid (null) onCompleted callback");
+
+            if ( ! url || typeof url !== 'string')
+                throw Error("Invalid (null) url");
+
+            backendBridge.call('DownloadApi.downloadFile'
+                               , [url, options, onCompleted, onProgress, onError]);
+        },
+
+        // Internal
+
+        /**
+         * @private
+         *
+         */
+        createObjectWrapper: function(objectType, objectId, content) {
+            var Constructor = _constructorFromName(objectType);
+            return new Constructor(objectId, content);
+        },
+    };
+};
+
+

=== modified file 'src/Ubuntu/UnityWebApps/unity-webapps-api.js.in'
--- src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-03-26 15:52:46 +0000
+++ src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-05-21 13:06:21 +0000
@@ -34,6 +34,7 @@
     //@include ./bindings/content-hub/client/content-hub.js
     //@include ./bindings/online-accounts/client/online-accounts.js
     //@include ./bindings/runtime-api/client/runtime-api.js
+    //@include ./bindings/download-manager/client/download-api.js
     //@include ./common/js/unity-backend-messaging-proxy.js
     //@include ./common/js/unity-binding-proxy.js
     //@include ./common/js/unity-binding-bridge.js
@@ -282,6 +283,7 @@
             AlarmApi: createAlarmApi(backend),
             ContentHub: createContentHubApi(backend),
             RuntimeApi: createRuntimeApi(backend),
+            DownloadApi: createDownloadApi(backend),
         };
 
         return api;

=== modified file 'tests/integration/autopilot/qml/FullWebViewApp.qml'
--- tests/integration/autopilot/qml/FullWebViewApp.qml	2014-04-22 15:40:04 +0000
+++ tests/integration/autopilot/qml/FullWebViewApp.qml	2014-05-21 13:06:21 +0000
@@ -66,8 +66,6 @@
         experimental.preferences.navigatorQtObjectEnabled: true
         experimental.preferences.developerExtrasEnabled: true
 
-        onLoadingChanged: console.debug('onLoadingChanged: loading changed: ' + loadRequest.url + ', status: ' + loadRequest.status)
-
         function getUnityWebappsProxies() {
             return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
         }

=== modified file 'tests/integration/autopilot/unity_webapps_qml/emulators/__init__.py'
--- tests/integration/autopilot/unity_webapps_qml/emulators/__init__.py	2013-06-17 14:46:51 +0000
+++ tests/integration/autopilot/unity_webapps_qml/emulators/__init__.py	2014-05-21 13:06:21 +0000
@@ -4,4 +4,3 @@
 # 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.
-

=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/__init__.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/__init__.py	2014-04-22 15:40:04 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/__init__.py	2014-05-21 13:06:21 +0000
@@ -9,23 +9,29 @@
 
 import os
 import os.path
-import shutil
-import tempfile
 import json
 
-from testtools.matchers import Contains, Equals, GreaterThan
+from autopilot import platform
+from testtools.matchers import Equals, GreaterThan
 from autopilot.matchers import Eventually
 
-from unity.emulators.unity import Unity
-
-from unity.tests import UnityTestCase
-
-class UnityWebappsTestCaseBase(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
+
+if platform.model() == 'Desktop':
+    from unity.tests import UnityTestCase
+    UnityWebappsTestCaseBaseParent = UnityTestCase
+else:
+    UnityWebappsTestCaseBaseParent = AutopilotTestCase
+
+class UnityWebappsTestCaseBase(UnityWebappsTestCaseBaseParent):
+    LOCAL_QML_LAUNCHER_APP_PATH = "%s/%s" % (
+        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')
+    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'
 
     BASE_URL = ''
@@ -44,10 +50,15 @@
         return self.INSTALLED_QML_LAUNCHER_APP_PATH
 
     def get_launch_params(self, url):
-        base_params = ['--qml=' + self.get_qml_browser_container_path(), '--url=' + url, '--app-id=unitywebappsqmllauncher', '--webappName=unitywebappsqmllauncher']
+        base_params = ['--qml=' + self.get_qml_browser_container_path(),
+            '--url=' + url,
+            '--app-id=unitywebappsqmllauncher',
+            '--webappName=unitywebappsqmllauncher']
         if os.path.exists(self.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=' + os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                '../../../../../src'))
         return base_params
 
     def launch_with_html_filepath(self, html_filepath):
@@ -58,8 +69,8 @@
 
         print 'Launching test with params:', params
         self.app = self.launch_test_application(self.get_qml_launcher_path(),
-            *params,
-            app_type='qt')
+                                                *params,
+                                                app_type='qt')
 
         self.assert_url_eventually_loaded(url)
         self.webviewContainer = self.get_webviewContainer()
@@ -97,5 +108,4 @@
         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 'result' in results and results['result'] or None

=== removed file 'tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py	2014-04-22 15:40:04 +0000
+++ tests/integration/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/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2014-04-22 15:40:04 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2014-05-21 13:06:21 +0000
@@ -7,16 +7,18 @@
 
 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
 
+
 class UnityWebappsApiInjectedTestCaseBase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_api_injected.html')
+    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'
 
@@ -30,28 +32,44 @@
         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;
         """
-        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;
         """
-        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 +79,20 @@
                 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'];
             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/integration/autopilot/unity_webapps_qml/tests/test_launcher.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_launcher.py	2013-09-23 19:59:29 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_launcher.py	2014-05-21 13:06:21 +0000
@@ -6,21 +6,16 @@
 # by the Free Software Foundation.
 
 import os
-import time
-
-from gi.repository import Unity, GObject
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
+
+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
 
+
 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'
@@ -34,6 +29,7 @@
         super(UnityWebappsLauncherTestCase, self).setUp()
         # On Touch the dbus unity if does is not exposed
         if platform.model() == 'Desktop':
+            from unity.emulators import ensure_unity_is_running
             ensure_unity_is_running()
         self.launch_with_html_filepath(self.get_html_test_file())
 
@@ -55,11 +51,8 @@
            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(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')))
@@ -78,6 +71,5 @@
            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')))
 

=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_mediaplayer.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	2013-09-23 19:59:29 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	2014-05-21 13:06:21 +0000
@@ -6,11 +6,8 @@
 # by the Free Software Foundation.
 
 import os
-import time
-
-from gi.repository import Unity, GObject
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
+
+from testtools.matchers import Equals
 from testtools import skipUnless
 
 from autopilot import platform
@@ -108,4 +105,3 @@
         self.eval_expression_in_page_unsafe(expr)
 
         self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('true')))
-