QtMir

Merge lp:~dandrader/qtmir/removeDBusWindowStack into lp:qtmir

removeDBusWindowStack
Merge into trunk

Proposed by Daniel d'Andrada on 2016-07-25

Status:	Merged
Approved by:	Gerry Boland on 2016-07-25
Approved revision:	530
Merged at revision:	537
Proposed branch:	lp:~dandrader/qtmir/removeDBusWindowStack
Merge into:	lp:qtmir
Prerequisite:	lp:~gerboland/qtmir/tests-use-stack-instead-of-heap
Diff against target:	868 lines (+66/-314) 7 files modified src/modules/Unity/Application/CMakeLists.txt (+0/-1) src/modules/Unity/Application/application_manager.cpp (+0/-39) src/modules/Unity/Application/application_manager.h (+0/-6) src/modules/Unity/Application/dbuswindowstack.cpp (+0/-116) src/modules/Unity/Application/dbuswindowstack.h (+0/-72) tests/framework/qtmir_test.cpp (+0/-1) tests/modules/ApplicationManager/application_manager_test.cpp (+66/-79)
To merge this branch:	bzr merge lp:~dandrader/qtmir/removeDBusWindowStack
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-07-25	Needs Fixing on 2016-07-25
Gerry Boland		2016-07-25	Approve on 2016-07-25
Review via email: mp+301083@code.launchpad.net

This proposal supersedes a proposal from 2016-06-23.

Commit Message

Remove com.canonical.Unity.WindowStack D-Bus service

Nobody knows of anyone using it and the code is outdated
(pre surface-based WM era), so it doesn't even work correctly.

Therefore this is effectively dead code.

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Not applicable

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-23: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/293/rebuild

review: Needs Fixing (continuous-integration)

Gerry Boland (gerboland) wrote on 2016-06-24: Posted in a previous version of this proposal

I'm happy to see this go. If such a feature is needed, it should appear in unity8

review: Approve

Gerry Boland (gerboland) on 2016-07-25:

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-25:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/309/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mir development team

 === modified file 'src/modules/Unity/Application/CMakeLists.txt'
 --- src/modules/Unity/Application/CMakeLists.txt	2016-07-05 12:41:04 +0000
 +++ src/modules/Unity/Application/CMakeLists.txt	2016-07-25 14:45:21 +0000
@@ -31,7 +31,6 @@
      ../../../common/debughelpers.cpp
      dbusfocusinfo.cpp
      plugin.cpp
--    dbuswindowstack.cpp
      mirsurfacemanager.cpp
      mirfocuscontroller.cpp
      mirsurface.cpp
 === modified file 'src/modules/Unity/Application/application_manager.cpp'
 --- src/modules/Unity/Application/application_manager.cpp	2016-06-24 16:28:37 +0000
 +++ src/modules/Unity/Application/application_manager.cpp	2016-07-25 14:45:21 +0000
@@ -19,7 +19,6 @@
  #include "application.h"
  #include "applicationinfo.h"
  #include "dbusfocusinfo.h"
--#include "dbuswindowstack.h"
  #include "mirfocuscontroller.h"
  #include "session.h"
  #include "sharedwakelock.h"
@@ -75,16 +74,6 @@
      return appId;
+ }
--void connectToSessionListener(ApplicationManager *manager, SessionListener *listener)
--{
--    QObject::connect(listener, &SessionListener::sessionStarting,
--                     manager, &ApplicationManager::onSessionStarting);
--    QObject::connect(listener, &SessionListener::sessionStopping,
--                     manager, &ApplicationManager::onSessionStopping);
--    QObject::connect(listener, &SessionListener::sessionCreatedSurface,
--                     manager, &ApplicationManager::onSessionCreatedSurface);
--}
--
  void connectToSessionAuthorizer(ApplicationManager *manager, SessionAuthorizer *authorizer)
+ {
      QObject::connect(authorizer, &SessionAuthorizer::requestAuthorizationForSession,
@@ -120,7 +109,6 @@
+     }
      MirWindowManager *windowManager =  static_cast<MirWindowManager*>(nativeInterface->nativeResourceForIntegration("WindowManager"));
--    SessionListener *sessionListener = static_cast<SessionListener*>(nativeInterface->nativeResourceForIntegration("SessionListener"));
      SessionAuthorizer *sessionAuthorizer = static_cast<SessionAuthorizer*>(nativeInterface->nativeResourceForIntegration("SessionAuthorizer"));
      QSharedPointer<TaskController> taskController(new upstart::TaskController());
@@ -140,7 +128,6 @@
                                               settings
                                           );
--    connectToSessionListener(appManager, sessionListener);
      connectToSessionAuthorizer(appManager, sessionAuthorizer);
      connectToTaskController(appManager, taskController.data());
      connect(windowManager, &MirWindowManager::sessionAboutToCreateSurface,
@@ -178,7 +165,6 @@
          QObject *parent)
      : ApplicationManagerInterface(parent)
      , m_dbusFocusInfo(new DBusFocusInfo(m_applications))
--    , m_dbusWindowStack(new DBusWindowStack(this))
      , m_taskController(taskController)
      , m_procInfo(procInfo)
      , m_sharedWakelock(sharedWakelock)
@@ -620,31 +606,6 @@
      authorized = true;
+ }
--void ApplicationManager::onSessionStarting(std::shared_ptr<ms::Session> const& session)
--{
--    Q_UNUSED(session);
--}
--
--void ApplicationManager::onSessionStopping(std::shared_ptr<ms::Session> const& session)
--{
--    Application* application = findApplicationWithSession(session);
--    if (application) {
--        m_dbusWindowStack->WindowDestroyed(0, application->appId());
--    }
--}
--
--void ApplicationManager::onSessionCreatedSurface(ms::Session const* session,
--                                               std::shared_ptr<ms::Surface> const& surface)
--{
--    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::onSessionCreatedSurface - sessionName=" << session->name().c_str();
--    Q_UNUSED(surface);
--
--    Application* application = findApplicationWithSession(session);
--    if (application) {
--        m_dbusWindowStack->WindowCreated(0, application->appId());
--    }
--}
--
  Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<ms::Session> &session)
+ {
      return findApplicationWithSession(session.get());
 === modified file 'src/modules/Unity/Application/application_manager.h'
 --- src/modules/Unity/Application/application_manager.h	2016-06-23 19:58:48 +0000
 +++ src/modules/Unity/Application/application_manager.h	2016-07-25 14:45:21 +0000
@@ -102,11 +102,6 @@
  public Q_SLOTS:
      void authorizeSession(const pid_t pid, bool &authorized);
--    void onSessionStarting(std::shared_ptr<mir::scene::Session> const& session);
--    void onSessionStopping(std::shared_ptr<mir::scene::Session> const& session);
--
--    void onSessionCreatedSurface(mir::scene::Session const*, std::shared_ptr<mir::scene::Surface> const&);
--
      void onProcessStarting(const QString& appId);
      void onProcessStopped(const QString& appId);
      void onProcessSuspended(const QString& appId);
@@ -140,7 +135,6 @@
      QList<Application*> m_applications;
      DBusFocusInfo *m_dbusFocusInfo;
--    DBusWindowStack* m_dbusWindowStack;
      QSharedPointer<TaskController> m_taskController;
      QSharedPointer<ProcInfo> m_procInfo;
      QSharedPointer<SharedWakelock> m_sharedWakelock;
 === removed file 'src/modules/Unity/Application/dbuswindowstack.cpp'
 --- src/modules/Unity/Application/dbuswindowstack.cpp	2016-01-20 21:36:39 +0000
 +++ src/modules/Unity/Application/dbuswindowstack.cpp	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
--/*
-- * Copyright (C) 2013-2015 Canonical, Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it under
-- * the terms of the GNU Lesser General Public License version 3, as published by
-- * the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--// local
--#include "dbuswindowstack.h"
--#include "application_manager.h"
--
--// Qt
--#include <QDBusConnection>
--#include <QDBusMetaType>
--
--namespace qtmir {
--
--DBusWindowStack::DBusWindowStack(ApplicationManager *parent) : QObject(parent)
--{
--    qRegisterMetaType<AppIdDesktopFile>();
--    qDBusRegisterMetaType<AppIdDesktopFile>();
--    qRegisterMetaType<WindowInfo>();
--    qRegisterMetaType< QList<WindowInfo> >();
--    qDBusRegisterMetaType<WindowInfo>();
--    qDBusRegisterMetaType< QList<WindowInfo> >();
--
--    QDBusConnection::sessionBus().registerService("com.canonical.Unity.WindowStack");
--    // TODO ExportScriptableSlots shouldn't be needed but without it i don't get the methods :-/
--    QDBusConnection::sessionBus().registerObject("/com/canonical/Unity/WindowStack", this, QDBusConnection::ExportAllSignals | QDBusConnection::ExportScriptableSlots |QDBusConnection::ExportScriptableInvokables );
--}
--
--DBusWindowStack::~DBusWindowStack()
--{
--}
--
--AppIdDesktopFile DBusWindowStack::GetAppIdFromPid(unsigned int pid)
--{
--    AppIdDesktopFile res;
--    ApplicationManager *appMgr = static_cast<ApplicationManager*>(parent());
--    const Application *app = appMgr->findApplicationWithPid(pid);
--    if (app) {
--        res.app_id = app->appId();
--        res.desktop_file = "";
--    }
--    return res;
--}
--
--QList<WindowInfo> DBusWindowStack::GetWindowStack()
--{
--    QList<WindowInfo> res;
--    ApplicationManager *appMgr = static_cast<ApplicationManager*>(parent());
--    const QList<Application*> &applications = appMgr->list();
--    Q_FOREACH(Application* app, applications) {
--        WindowInfo wi;
--        wi.window_id = 0;
--        wi.app_id = app->appId();
--        wi.focused = app->focused();
--        wi.stage = 0;
--        res << wi;
--    }
--    return res;
--}
--
--QStringList DBusWindowStack::GetWindowProperties(unsigned int window_id, const QString &app_id,
--            const QStringList &names)
--{
--    Q_UNUSED(window_id);
--    Q_UNUSED(app_id);
--    Q_UNUSED(names);
--    return QStringList();
--}
--
--QDBusArgument &operator<<(QDBusArgument &a, const AppIdDesktopFile &aidf)
--{
--    a.beginStructure();
--    a << aidf.app_id << aidf.desktop_file;
--    a.endStructure();
--    return a;
--}
--
--const QDBusArgument &operator>>(const QDBusArgument &a, AppIdDesktopFile &aidf)
--{
--    a.beginStructure();
--    a >> aidf.app_id >> aidf.desktop_file;
--    a.endStructure();
--
--    return a;
--}
--
--QDBusArgument &operator<<(QDBusArgument &a, const WindowInfo &wi)
--{
--    a.beginStructure();
--    a << wi.window_id << wi.app_id << wi.focused << wi.stage;
--    a.endStructure();
--    return a;
--}
--
--const QDBusArgument &operator>>(const QDBusArgument &a, WindowInfo &wi)
--{
--    a.beginStructure();
--    a >> wi.window_id >> wi.app_id >> wi.focused >> wi.stage;
--    a.endStructure();
--
--    return a;
--}
--
--} // namespace qtmir
 === removed file 'src/modules/Unity/Application/dbuswindowstack.h'
 --- src/modules/Unity/Application/dbuswindowstack.h	2015-08-11 12:08:32 +0000
 +++ src/modules/Unity/Application/dbuswindowstack.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
--/*
-- * Copyright (C) 2013-2015 Canonical, Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it under
-- * the terms of the GNU Lesser General Public License version 3, as published by
-- * the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef DBUSWINDOWSTACK_H
--#define DBUSWINDOWSTACK_H
--
--#include <QObject>
--#include <QDBusArgument>
--
--namespace qtmir {
--
--class ApplicationManager;
--
--class AppIdDesktopFile
--{
--public:
--    QString app_id;
--    QString desktop_file;
--};
--
--QDBusArgument &operator<<(QDBusArgument &a, const AppIdDesktopFile &aidf);
--const QDBusArgument &operator>>(const QDBusArgument &a, AppIdDesktopFile &aidf);
--
--class WindowInfo
--{
--public:
--    unsigned int window_id;
--    QString app_id;
--    bool focused;
--    unsigned int stage;
--};
--
--QDBusArgument &operator<<(QDBusArgument &a, const WindowInfo &aidf);
--const QDBusArgument &operator>>(const QDBusArgument &a, WindowInfo &aidf);
--
--class DBusWindowStack : public QObject
--{
--    Q_OBJECT
--    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.WindowStack")
--public:
--    explicit DBusWindowStack(ApplicationManager* parent);
--    ~DBusWindowStack();
--
--    Q_INVOKABLE Q_SCRIPTABLE qtmir::AppIdDesktopFile GetAppIdFromPid(unsigned int pid);
--    Q_INVOKABLE Q_SCRIPTABLE QList<qtmir::WindowInfo> GetWindowStack();
--    Q_INVOKABLE Q_SCRIPTABLE QStringList GetWindowProperties(unsigned int window_id, const QString &app_id, const QStringList &names);
--
--Q_SIGNALS:
--    void FocusedWindowChanged(unsigned int window_id, const QString &app_id, unsigned int stage);
--    void WindowCreated(unsigned int window_id, const QString &app_id);
--    void WindowDestroyed(unsigned int window_id, const QString &app_id);
--};
--
--} // namespace qtmir
--
--Q_DECLARE_METATYPE(qtmir::AppIdDesktopFile);
--Q_DECLARE_METATYPE(qtmir::WindowInfo);
--
--#endif // DBUSWINDOWSTACK_H
 === modified file 'tests/framework/qtmir_test.cpp'
 --- tests/framework/qtmir_test.cpp	2016-05-06 08:23:46 +0000
 +++ tests/framework/qtmir_test.cpp	2016-07-25 14:45:21 +0000
@@ -153,7 +153,6 @@
      EXPECT_EQ(authed, true);
      auto appSession = std::make_shared<mir::scene::MockSession>(appId.toStdString(), procId);
--    applicationManager.onSessionStarting(appSession);
      sessionManager.onSessionStarting(appSession);
      Mock::VerifyAndClearExpectations(taskController);
 === modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
 --- tests/modules/ApplicationManager/application_manager_test.cpp	2016-07-25 14:45:20 +0000
 +++ tests/modules/ApplicationManager/application_manager_test.cpp	2016-07-25 14:45:21 +0000
@@ -42,14 +42,6 @@
      ~ApplicationManagerTests() {
+     }
--    inline void onSessionStarting(const std::shared_ptr<mir::scene::Session> &session) {
--        applicationManager.onSessionStarting(session);
--        sessionManager.onSessionStarting(session);
--    }
--    inline void onSessionStopping(const std::shared_ptr<mir::scene::Session> &session) {
--        applicationManager.onSessionStopping(session);
--        sessionManager.onSessionStopping(session);
--    }
      inline void onSessionCreatedSurface(const mir::scene::Session *mirSession,
              MirSurfaceInterface *qmlSurface) {
@@ -57,11 +49,6 @@
          if (qmlSession) {
              qmlSession->registerSurface(qmlSurface);
+         }
--
--        // I assume that applicationManager ignores the mirSurface parameter, so sending
--        // a null shared pointer must suffice
--        std::shared_ptr<mir::scene::Surface> mirSurface(nullptr);
--        applicationManager.onSessionCreatedSurface(mirSession, mirSurface);
+     }
      inline void suspend(Application *application) {
@@ -105,7 +92,7 @@
      std::shared_ptr<mir::scene::Session> mirSession = std::make_shared<MockSession>(dialer_app_id, firstProcId);
      applicationManager.authorizeSession(firstProcId, authed);
      ASSERT_EQ(true, authed);
--    onSessionStarting(mirSession);
++    sessionManager.onSessionStarting(mirSession);
      onSessionCreatedSurface(mirSession.get(), &surface);
      surface.drawFirstFrame();
      Application * application = applicationManager.findApplication(dialer_app_id);
@@ -135,10 +122,10 @@
      std::shared_ptr<mir::scene::Session> mirSession = std::make_shared<MockSession>(app_id, procId);
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(mirSession);
++    sessionManager.onSessionStarting(mirSession);
      Application * beforeFailure = applicationManager.findApplication(app_id);
      applicationManager.onProcessStarting(app_id);
--    onSessionStopping(mirSession);
++    sessionManager.onSessionStopping(mirSession);
      applicationManager.onProcessFailed(app_id, TaskController::Error::APPLICATION_FAILED_TO_START);
      Application * afterFailure = applicationManager.findApplication(app_id);
@@ -256,9 +243,9 @@
      applicationManager.authorizeSession(first_procId, authed);
      applicationManager.authorizeSession(second_procId, authed);
      applicationManager.authorizeSession(third_procId, authed);
--    onSessionStarting(first_session);
--    onSessionStarting(third_session);
--    onSessionStarting(second_session);
++    sessionManager.onSessionStarting(first_session);
++    sessionManager.onSessionStarting(third_session);
++    sessionManager.onSessionStarting(second_session);
      Application * firstApp = applicationManager.findApplication(first_app_id);
      Application * secondApp = applicationManager.findApplication(second_app_id);
@@ -290,16 +277,16 @@
      std::shared_ptr<mir::scene::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
      applicationManager.authorizeSession(a_procId, authed);
--    onSessionStarting(first_session);
--    onSessionStarting(second_session);
++    sessionManager.onSessionStarting(first_session);
++    sessionManager.onSessionStarting(second_session);
      Application * the_app = applicationManager.findApplication(an_app_id);
      EXPECT_EQ(true, authed);
      EXPECT_EQ(second_session, the_app->session()->session());
--    onSessionStopping(first_session);
--    onSessionStopping(second_session);
++    sessionManager.onSessionStopping(first_session);
++    sessionManager.onSessionStopping(second_session);
      qtApp.sendPostedEvents(nullptr, QEvent::DeferredDelete);
+ }
@@ -325,10 +312,10 @@
      std::shared_ptr<mir::scene::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
      applicationManager.authorizeSession(a_procId, authed);
--    onSessionStarting(first_session);
++    sessionManager.onSessionStarting(first_session);
      onSessionCreatedSurface(first_session.get(), &aSurface);
      aSurface.drawFirstFrame();
--    onSessionStarting(second_session);
++    sessionManager.onSessionStarting(second_session);
      Application * the_app = applicationManager.findApplication(an_app_id);
@@ -336,8 +323,8 @@
      EXPECT_EQ(Application::Running, the_app->state());
      EXPECT_EQ(first_session, the_app->session()->session());
--    onSessionStopping(first_session);
--    onSessionStopping(second_session);
++    sessionManager.onSessionStopping(first_session);
++    sessionManager.onSessionStopping(second_session);
      qtApp.sendPostedEvents(nullptr, QEvent::DeferredDelete);
+ }
@@ -358,7 +345,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("Oo", procId);
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      Application * app = applicationManager.findApplication("app");
      app->setRequestedState(Application::RequestedSuspended);
@@ -408,9 +395,9 @@
      applicationManager.authorizeSession(first_procId, authed);
      applicationManager.authorizeSession(second_procId, authed);
      applicationManager.authorizeSession(third_procId, authed);
--    onSessionStarting(first_session);
--    onSessionStarting(third_session);
--    onSessionStarting(second_session);
++    sessionManager.onSessionStarting(first_session);
++    sessionManager.onSessionStarting(third_session);
++    sessionManager.onSessionStarting(second_session);
      QSignalSpy spy(&applicationManager, SIGNAL(focusRequested(const QString &)));
@@ -717,7 +704,7 @@
      // Authorize session and emit Mir sessionStarting event
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      EXPECT_EQ(countSpy.count(), 0);
      EXPECT_EQ(applicationManager.count(), 1);
@@ -752,7 +739,7 @@
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      FakeMirSurface surface;
@@ -785,7 +772,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
@@ -800,7 +787,7 @@
      // emulate mir session dying and taskController emitting processStopped(appId) in response
      // to the taskController->stop(appId) call from applicationManager
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      applicationManager.onProcessStopped(appId);
      EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
@@ -828,7 +815,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<NiceMock<MockSession>>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      QScopedPointer<FakeMirSurface> surface(new FakeMirSurface);
      onSessionCreatedSurface(session.get(), surface.data());
@@ -852,7 +839,7 @@
      EXPECT_EQ(Application::InternalState::Closing, app->internalState());
      // Simulates that the application complied to the close() request and stopped itself
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      applicationManager.onProcessStopped(appId);
      EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
@@ -880,7 +867,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      FakeMirSurface surface;
      onSessionCreatedSurface(session.get(), &surface);
@@ -888,7 +875,7 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of stopping app
      applicationManager.onProcessStopped(appId);
@@ -918,7 +905,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      FakeMirSurface surface;
      onSessionCreatedSurface(session.get(), &surface);
@@ -926,7 +913,7 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of crashing / OOM killed app
      applicationManager.onProcessFailed(appId, TaskController::Error::APPLICATION_CRASHED);
@@ -962,7 +949,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      FakeMirSurface surface;
      onSessionCreatedSurface(session.get(), &surface);
@@ -974,7 +961,7 @@
      QSignalSpy focusSpy(&applicationManager, SIGNAL(focusedApplicationIdChanged()));
      // Mir reports disconnection
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of crashing / OOM-killed app
      applicationManager.onProcessFailed(appId, TaskController::Error::APPLICATION_CRASHED);
@@ -1014,7 +1001,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      FakeMirSurface surface;
      onSessionCreatedSurface(session.get(), &surface);
@@ -1026,7 +1013,7 @@
      QSignalSpy focusSpy(&applicationManager, SIGNAL(focusedApplicationIdChanged()));
      // Mir reports disconnection
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of crashing app
      applicationManager.onProcessFailed(appId, TaskController::Error::APPLICATION_FAILED_TO_START);
@@ -1061,12 +1048,12 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
      // Mir notifies of stopping app
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
      EXPECT_EQ(applicationManager.count(), 0);
@@ -1093,7 +1080,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // Associate a surface so AppMan considers app Running, check focused
      FakeMirSurface surface;
@@ -1103,7 +1090,7 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
      // Mir notifies of stopping app
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
      EXPECT_EQ(applicationManager.count(), 0);
@@ -1131,7 +1118,7 @@
      applicationManager.authorizeSession(procId, authed);
      EXPECT_EQ(authed, true);
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // Associate a surface so AppMan considers app Running, check focused
      FakeMirSurface surface;
@@ -1141,7 +1128,7 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
      // Mir notifies of stopping app
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
      EXPECT_EQ(applicationManager.count(), 0);
@@ -1172,7 +1159,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      EXPECT_EQ(Application::Starting, app->state());
      app->setRequestedState(Application::RequestedSuspended);
@@ -1196,7 +1183,7 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
      // Mir notifies of stopping app
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      EXPECT_EQ(0, countSpy.count());
      EXPECT_EQ(1, applicationManager.count());
@@ -1225,7 +1212,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      Mock::VerifyAndClearExpectations(taskController);
      EXPECT_CALL(*taskController, stop(appId))
@@ -1237,7 +1224,7 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
      // the mir session always ends before upstart notifies the process has stopped
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of stopping app
      applicationManager.onProcessStopped(appId);
@@ -1281,10 +1268,10 @@
      bool authed = false;
      applicationManager.authorizeSession(procId1, authed);
--    onSessionStarting(session1);
++    sessionManager.onSessionStarting(session1);
      EXPECT_EQ(authed, true);
      applicationManager.authorizeSession(procId2, authed);
--    onSessionStarting(session2);
++    sessionManager.onSessionStarting(session2);
      EXPECT_EQ(authed, true);
      FakeMirSurface *surface = new FakeMirSurface;
      onSessionCreatedSurface(session2.get(), surface);
@@ -1293,8 +1280,8 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
      // Mir notifies of stopping app/Session
--    onSessionStopping(session2);
--    onSessionStopping(session1);
++    sessionManager.onSessionStopping(session2);
++    sessionManager.onSessionStopping(session1);
      EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
      EXPECT_EQ(applicationManager.count(), 0);
@@ -1340,10 +1327,10 @@
      bool authed = false;
      applicationManager.authorizeSession(procId1, authed);
--    onSessionStarting(session1);
++    sessionManager.onSessionStarting(session1);
      EXPECT_EQ(true, authed);
      applicationManager.authorizeSession(procId2, authed);
--    onSessionStarting(session2);
++    sessionManager.onSessionStarting(session2);
      EXPECT_EQ(true, authed);
      // both sessions create surfaces, then get them all suspended
@@ -1359,8 +1346,8 @@
      QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
      // Mir notifies of stopping app/Session
--    onSessionStopping(session2);
--    onSessionStopping(session1);
++    sessionManager.onSessionStopping(session2);
++    sessionManager.onSessionStopping(session1);
      EXPECT_EQ(0, countSpy.count());
@@ -1399,7 +1386,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // App creates surface, puts it in background, then is OOM killed.
      QScopedPointer<FakeMirSurface> surface(new FakeMirSurface);
@@ -1408,7 +1395,7 @@
      suspend(app);
      surface->setLive(false);
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      applicationManager.onProcessFailed(appId, TaskController::Error::APPLICATION_CRASHED);
      applicationManager.onProcessStopped(appId);
@@ -1452,7 +1439,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // App creates surface, focuses it so state is running
      FakeMirSurface surface;
@@ -1516,7 +1503,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // App creates surface, focuses it so state is running
      FakeMirSurface surface;
@@ -1554,7 +1541,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // Create fake QML cache for this app
      QString path(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)
@@ -1594,7 +1581,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // Have app in fully Running state
      FakeMirSurface *aSurface = new FakeMirSurface;
@@ -1609,7 +1596,7 @@
      dir.mkpath(path);
      // Report app crash
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of **crashing** app
      applicationManager.onProcessFailed(appId, TaskController::Error::APPLICATION_FAILED_TO_START);
      applicationManager.onProcessStopped(appId);
@@ -1639,7 +1626,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      // Have app in fully Running state
      FakeMirSurface aSurface;
@@ -1654,7 +1641,7 @@
      dir.mkpath(path);
      // Report app stop
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of stopping app
      applicationManager.onProcessStopped(appId);
@@ -1710,7 +1697,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      Mock::VerifyAndClearExpectations(taskController);
@@ -1725,7 +1712,7 @@
      applicationManager.stopApplication(appId);
      // the mir session always ends before upstart notifies the process has stopped
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      // Upstart notifies of stopping app
      applicationManager.onProcessStopped(appId);
@@ -1762,7 +1749,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      QScopedPointer<FakeMirSurface> surface(new FakeMirSurface);
      onSessionCreatedSurface(session.get(), surface.data());
@@ -1799,7 +1786,7 @@
      QSignalSpy appAddedSpy(&applicationManager, &QAbstractItemModel::rowsInserted);
      // Simulates that the application complied to the close() request and stopped itself
--    onSessionStopping(session);
++    sessionManager.onSessionStopping(session);
      applicationManager.onProcessStopped(appId);
      // DeferredDelete is special: likes to be called out specifically or it won't come out
@@ -1838,7 +1825,7 @@
      std::shared_ptr<mir::scene::Session> session1 = std::make_shared<MockSession>("", procId1);
      bool authed = true;
      applicationManager.authorizeSession(procId1, authed);
--    onSessionStarting(session1);
++    sessionManager.onSessionStarting(session1);
      FakeMirSurface surface1;
      surface1.setSession(app1->session());
@@ -1865,7 +1852,7 @@
      std::shared_ptr<mir::scene::Session> session2 = std::make_shared<MockSession>("", procId2);
      authed = true;
      applicationManager.authorizeSession(procId2, authed);
--    onSessionStarting(session2);
++    sessionManager.onSessionStarting(session2);
      FakeMirSurface surface2;
      surface2.setSession(app2->session());
@@ -1912,7 +1899,7 @@
      std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
      bool authed = true;
      applicationManager.authorizeSession(procId, authed);
--    onSessionStarting(session);
++    sessionManager.onSessionStarting(session);
      FakeMirSurface surface;
      onSessionCreatedSurface(session.get(), &surface);