Merge lp:~osomon/webbrowser-app/ua-chromium-version-from-oxide into lp:webbrowser-app

[Olivier Tilloy]

Use the chromium version exposed by oxide in the default UA string.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1419
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/445/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/447/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/447
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/446
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/446
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/447/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/447/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/447/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/447/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/447/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/447/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/445/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1419
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2691/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6821/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6832/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2691/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-04-08 17:06:09 +0000
+++ debian/control	2016-04-14 15:11:09 +0000
@@ -115,7 +115,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         liboxideqt-qmlplugin (>= 1.12),
+         liboxideqt-qmlplugin (>= 1.15),
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),

=== modified file 'src/Ubuntu/Web/UserAgent02.qml'
--- src/Ubuntu/Web/UserAgent02.qml	2015-12-10 10:43:04 +0000
+++ src/Ubuntu/Web/UserAgent02.qml	2016-04-14 15:11:09 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -17,6 +17,7 @@
  */
 
 import QtQml 2.0
+import com.canonical.Oxide 1.15
 
 /*
  * Useful documentation:
@@ -57,11 +58,7 @@
     // See chromium/src/content/webkit_version.h.in in oxide’s source tree.
     readonly property string _webkitVersion: "537.36"
 
-    // See chromium/src/chrome/VERSION in oxide’s source tree.
-    // Note: the actual version number probably doesn’t matter that much,
-    //       however its format does, so we probably don’t need to bump it
-    //       every time we rebase on a newer chromium.
-    readonly property string _chromiumVersion: "35.0.1870.2"
+    readonly property string _chromiumVersion: Oxide.chromiumVersion
 
     readonly property string _formFactor: smallScreen ? "Mobile" : ""