Merge lp:~afrantzis/unity-system-compositor/update-for-mir-r4015 into lp:unity-system-compositor

[Alexandros Frantzis]

Update code for Mir changes up to r4015

Update code for Mir changes up to r4015

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:306
https://mir-jenkins.ubuntu.com/job/usc-ci/52/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/73
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3986
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3976
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3976
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3976
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/77
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/77/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/77
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/77/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/77
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/77/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/77
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/77/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/77
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/77/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/52/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp	2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_session_switcher.cpp	2017-02-06 12:49:42 +0000
@@ -105,6 +105,14 @@
     {
         return {};
     }
+    mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override
+    {
+        return {};
+    }
+    mir::graphics::BufferID create_buffer(mir::geometry::Size, uint32_t, uint32_t) override
+    {
+        return {};
+    }
     void destroy_buffer(mir::graphics::BufferID) override
     {
     }