Merge lp:~mterry/unity8/session-lightdm into lp:unity8

[Michael Terry]

Use liblightdm for session lockscreen too.
This lets us switch users directly from the lockscreen, rather than going to the system greeter.

This is mostly simplification.

- I drop the distinction between FullLightDM and IntegratedLightDM. Now we always use the full lightdm experience. This lets us drop our custom PAM and custom user code in IntegratedLightDM. No more support for ~/.unity8-greeter-demo, but that's fine. We don't need it anymore with this branch.

- I add a "greeterMode" property to our AccountsService plugin. This toggles whether we try to write non-active user properties back to the system AccountsService daemon or not. When running in-session, we don't want to. We don't have permission to anyway, and it doesn't really matter for the properties we change (notably, the FailedLogins count -- we can just keep track of that locally. It's not urgent that we write that to disk in this case.)

As part of landing, we should backport lightdm from yakkety. Silo 1679 has this MP, a backported lightdm, and the related branches listed below.

FIXME: this needs some more work:
- Needs re-testing after some big merges from trunk that I've done.
- It seems to cause (exacerbate?) a crash when switching between sessions, something to do with VT switches failing...?
- Needs some security work to tag unity8 with an apparmor label and have liblightdm only allow in-session connections that have that label.

======

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Yes. Two config changes to enable this new mode:
 - https://code.launchpad.net/~mterry/unity8-desktop-session/session-lightdm/+merge/300129
 - https://code.launchpad.net/~mterry/ubuntu-touch-session/session-lightdm/+merge/300224

 And a backported yakkety lightdm.

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

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 I'm on the team.

 * If you changed the UI, has there been a design review?
 NA

Unmerged revisions

2799. By Michael Terry on 2017-01-26

Drop IntegratedLightDM and always use system liblightdm instead

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-24 07:39:33 +0000
+++ CMakeLists.txt	2017-01-26 16:33:43 +0000
@@ -74,6 +74,7 @@
 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
 pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
 pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
 pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)

=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2017-01-24 07:43:35 +0000
+++ cmake/modules/QmlTest.cmake	2017-01-26 16:33:43 +0000
@@ -114,11 +114,11 @@
 # This function wraps add_executable_test, see below for available arguments.
 
 function(add_qml_unittest PATH COMPONENT_NAME)
-    import_executables(qmltestrunner)
+    import_executables(dbus-run-session)
 
-    add_executable_test(${COMPONENT_NAME} qmltestrunner
+    add_executable_test(${COMPONENT_NAME} dbus-run-session
         ${ARGN}
-        ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
+        ARGS -- qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
     )
 
     if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")

=== modified file 'data/unity8.conf'
--- data/unity8.conf	2017-01-18 00:25:13 +0000
+++ data/unity8.conf	2017-01-26 16:33:43 +0000
@@ -24,23 +24,23 @@
     # Tell unity-mir to raise SIGSTOP after we start
     initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
 
-    if [ -n "$MIR_SOCKET" ]; then
+    if [ -n "$(initctl get-env --global MIR_SERVER_HOST_SOCKET)" ]; then
         # FIXME Create an autopilot test that makes sure start+stop and restart
         #       work fine at least 2 times
-        # Save original value of MIR_SOCKET in case we are stopped,
+        # Save original value of MIR_SERVER_HOST_SOCKET in case we are stopped,
         # as we modify the variable for future jobs, including ourself.
-        UNITY_MIR_SOCKET=$(initctl get-env --global MIR_SOCKET)
+        UNITY_MIR_SOCKET=$(initctl get-env --global MIR_SERVER_HOST_SOCKET)
         initctl set-env --global UNITY_MIR_SOCKET=$UNITY_MIR_SOCKET
 
+        # Point all future jobs in this session to our Mir socket instead of
+        # unity-system-compositor's socket.
+        MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
+        initctl set-env --global MIR_SERVER_HOST_SOCKET=$MIR_SERVER_FILE
+        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SERVER_HOST_SOCKET': '$MIR_SERVER_FILE'}"
+
         # Point unity8 at unity-system-compositor
-        MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
         initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
         initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
-
-        # Point all future jobs in this session to our Mir socket instead of
-        # unity-system-compositor's socket.
-        initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
-        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
     fi
 
     # Remove the normal and trusted sockets if still there
@@ -74,7 +74,7 @@
 exec ${BINARY:-unity8} --mode=$MODE $ARGS
 
 post-start script
-    # If no MIR_SOCKET was defined on launch, we try to set one here
+    # If no MIR_SERVER_HOST_SOCKET was defined on launch, we try to set one here
     if [ -z "$(initctl get-env --global UNITY_MIR_SOCKET)" ]; then
         if [ -S "$XDG_RUNTIME_DIR/mir_socket" ]; then
             mir_socket=$XDG_RUNTIME_DIR/mir_socket
@@ -83,7 +83,7 @@
         fi
 
         if [ -n "$mir_socket" ]; then
-            initctl set-env --global MIR_SOCKET="$mir_socket"
+            initctl set-env --global MIR_SERVER_HOST_SOCKET="$mir_socket"
         fi
     fi
 
@@ -91,7 +91,7 @@
 end script
 
 post-stop script
-    initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
+    initctl set-env --global MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
     initctl unset-env --global UNITY_MIR_SOCKET
     initctl unset-env --global MIR_SERVER_PROMPT_FILE
     initctl emit application-end

=== modified file 'debian/rules'
--- debian/rules	2017-01-18 00:25:13 +0000
+++ debian/rules	2017-01-26 16:33:43 +0000
@@ -38,6 +38,4 @@
 	dh_makeshlibs -Nunity8-private -Nunity8-tests
 
 override_dh_shlibdeps:
-	# Some mock libraries link against liblightdm-qt5-3.so which we want to
-	# avoid, since we only really link against our mock one, not the system one.
-	dh_shlibdeps -XlibMockAccountsService-qml.so -Lunity8-private
+	dh_shlibdeps -Lunity8-private

=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2016-12-19 19:55:07 +0000
+++ plugins/AccountsService/AccountsService.cpp	2017-01-26 16:33:43 +0000
@@ -80,6 +80,7 @@
 AccountsService::AccountsService(QObject* parent, const QString &user)
     : QObject(parent)
     , m_service(new AccountsServiceDBusAdaptor(this))
+    , m_greeterMode(true)
 {
     m_unityInput = new QDBusInterface(QStringLiteral("com.canonical.Unity.Input"),
                                       QStringLiteral("/com/canonical/Unity/Input"),
@@ -155,6 +156,19 @@
     refresh(!wasEmpty);
 }
 
+bool AccountsService::greeterMode() const
+{
+    return m_greeterMode;
+}
+
+void AccountsService::setGreeterMode(bool greeterMode)
+{
+    if (m_greeterMode != greeterMode) {
+        m_greeterMode = greeterMode;
+        Q_EMIT greeterModeChanged();
+    }
+}
+
 bool AccountsService::demoEdges() const
 {
     auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES);
@@ -341,7 +355,19 @@
 {
     if (m_properties[interface][property].value != value) {
         m_properties[interface][property].value = value;
-        m_service->setUserPropertyAsync(m_user, interface, property, value);
+        if (m_greeterMode || m_user == g_get_user_name()) {
+            // Only write any changes back to AccountsService if we are running
+            // as a proper LightDM greeter (or are writing values for our own
+            // user).
+            // (A) Only the lightdm user has permission to set everyone's
+            //     properties.
+            // (B) We don't want to have policykit throw up a password dialog
+            //     when we are running in the user session.
+            // (C) We only write things to AS that are safe to ignore for other
+            //     users anyway (like failedLogins count, which does not NEED
+            //     to be persistent).
+            m_service->setUserPropertyAsync(m_user, interface, property, value);
+        }
         emitChangedForProperty(interface, property);
     }
 }

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2017-01-18 00:25:13 +0000
+++ plugins/AccountsService/AccountsService.h	2017-01-26 16:33:43 +0000
@@ -33,6 +33,10 @@
                 READ user
                 WRITE setUser
                 NOTIFY userChanged)
+    Q_PROPERTY (bool greeterMode
+                READ greeterMode
+                WRITE setGreeterMode
+                NOTIFY greeterModeChanged)
     Q_PROPERTY (bool demoEdges
                 READ demoEdges
                 WRITE setDemoEdges
@@ -92,6 +96,8 @@
 
     QString user() const;
     void setUser(const QString &user);
+    bool greeterMode() const;
+    void setGreeterMode(bool greeterMode);
     bool demoEdges() const;
     void setDemoEdges(bool demoEdges);
     QStringList demoEdgesCompleted() const;
@@ -119,6 +125,7 @@
 
 Q_SIGNALS:
     void userChanged();
+    void greeterModeChanged();
     void demoEdgesChanged();
     void demoEdgesCompletedChanged();
     void enableFingerprintIdentificationChanged();
@@ -167,6 +174,7 @@
     AccountsServiceDBusAdaptor *m_service;
     QDBusInterface *m_unityInput;
     QString m_user;
+    bool m_greeterMode;
 };
 
 #endif

=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2017-01-19 15:37:24 +0000
+++ plugins/LightDM/CMakeLists.txt	2017-01-26 16:33:43 +0000
@@ -1,18 +1,20 @@
 pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
 
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Quick REQUIRED)
-
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
     ${libunity8-private_SOURCE_DIR}
+    )
+
+include_directories(
+    SYSTEM
+    ${LIBLIGHTDM_INCLUDE_DIRS}
     ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
-)
+    )
 
-set(QMLPLUGIN_SRC
-    ../Utils/unitysortfilterproxymodelqml.cpp
+add_library(LightDM-qml MODULE
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     DBusGreeter.cpp
     DBusGreeterList.cpp
     Greeter.cpp
@@ -22,5 +24,11 @@
     UsersModel.cpp
     )
 
-add_subdirectory(FullLightDM)
-add_subdirectory(IntegratedLightDM)
+target_link_libraries(LightDM-qml
+    unity8-private
+    ${LIBLIGHTDM_LDFLAGS}
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    )
+
+qt5_use_modules(LightDM-qml DBus Gui Qml)
+add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)

=== removed file 'plugins/LightDM/FullLightDM/CMakeLists.txt'
--- plugins/LightDM/FullLightDM/CMakeLists.txt	2016-11-28 10:13:37 +0000
+++ plugins/LightDM/FullLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
-
-set(PLUGIN_CLASSNAME "FullLightDM")
-
-add_definitions(-DFULL_LIGHTDM)
-
-include_directories(
-    ../
-    ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
-include_directories(
-    SYSTEM
-    ${LIBLIGHTDM_INCLUDE_DIRS}
-    )
-
-foreach(source_file ${QMLPLUGIN_SRC})
-    list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
-endforeach()
-
-add_library(FullLightDM-qml MODULE
-    ${RELATIVE_QMLPLUGIN_SRC}
-    )
-
-target_link_libraries(FullLightDM-qml
-    unity8-private
-    ${LIBLIGHTDM_LDFLAGS}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    )
-
-qt5_use_modules(FullLightDM-qml DBus Gui Qml)
-add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

=== removed file 'plugins/LightDM/IntegratedLightDM/CMakeLists.txt'
--- plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-07-08 15:44:53 +0000
+++ plugins/LightDM/IntegratedLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-set(PLUGIN_CLASSNAME "IntegratedLightDM")
-
-add_definitions(-DINTEGRATED_LIGHTDM)
-
-foreach(include_directory ${QMLPLUGIN_INCLUDES})
-        list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})
-endforeach()
-
-include_directories(
-    . #QLightDM
-    ${QMLPLUGIN_INCLUDES}
-    ${libunity8-private_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-foreach(source_file ${QMLPLUGIN_SRC})
-    list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
-endforeach()
-
-add_library(IntegratedLightDM-qml MODULE
-    ${RELATIVE_QMLPLUGIN_SRC}
-    )
-
-target_link_libraries(IntegratedLightDM-qml
-    integratedLightDM
-    unity8-private
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    )
-
-qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
-add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
-
-add_subdirectory(liblightdm)

=== removed directory 'plugins/LightDM/IntegratedLightDM/QLightDM'
=== removed file 'plugins/LightDM/IntegratedLightDM/QLightDM/Greeter'
--- plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	2016-06-13 21:21:57 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../liblightdm/Greeter.h"

=== removed file 'plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
--- plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2016-06-13 21:21:57 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../liblightdm/SessionsModel.h"

=== removed file 'plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel'
--- plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	2016-06-13 21:21:57 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../liblightdm/UsersModel.h"

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt'
--- plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-03-17 16:51:38 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
-
-set(LibLightDM_SOURCES
-    Greeter.cpp
-    SessionsModel.cpp
-    UsersModel.cpp
-    GreeterPrivate.cpp
-    SessionsModelPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
-    )
-
-add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
-add_library(integratedLightDMSession STATIC ${LibLightDM_SOURCES})
-add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${GLIB_INCLUDE_DIRS}
-    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
-)
-
-target_link_libraries(integratedLightDM
-    ${GLIB_LIBRARIES}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-target_link_libraries(integratedLightDMSession
-    ${GLIB_LIBRARIES}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-target_link_libraries(MockLightDM-demo-shared
-    ${GLIB_LIBRARIES}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-
-qt5_use_modules(integratedLightDM Concurrent DBus Gui)
-qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)
-qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)
-
-set_target_properties(integratedLightDM PROPERTIES
-                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
-set_target_properties(integratedLightDMSession PROPERTIES
-                      COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
-set_target_properties(MockLightDM-demo-shared PROPERTIES
-                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
-                      OUTPUT_NAME lightdm-qt5-3)
-
-install(TARGETS MockLightDM-demo-shared
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
-    )

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2017-01-18 21:18:31 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/Lightdm/liblightdm
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-
-#include "Greeter.h"
-#include "GreeterPrivate.h"
-#include <QtCore/QCoreApplication>
-#include <QTimer>
-
-namespace QLightDM
-{
-
-Greeter::Greeter(QObject *parent)
-  : QObject(parent),
-    d_ptr(new GreeterPrivate(this))
-{
-}
-
-Greeter::~Greeter()
-{
-}
-
-QString Greeter::authenticationUser() const
-{
-    Q_D(const Greeter);
-    return d->authenticationUser;
-}
-
-bool Greeter::hasGuestAccountHint() const
-{
-    return false;
-}
-
-QString Greeter::getHint(const QString &name) const
-{
-    Q_UNUSED(name)
-    return QLatin1String("");
-}
-
-QString Greeter::defaultSessionHint() const
-{
-    return QStringLiteral("ubuntu");
-}
-
-bool Greeter::hideUsersHint() const
-{
-    return false;
-}
-
-bool Greeter::showManualLoginHint() const
-{
-    return false;
-}
-
-bool Greeter::showRemoteLoginHint() const
-{
-    return false;
-}
-
-QString Greeter::selectUserHint() const
-{
-    return QLatin1String("");
-}
-
-bool Greeter::selectGuestHint() const
-{
-    return false;
-}
-
-QString Greeter::autologinUserHint() const
-{
-    return QLatin1String("");
-}
-
-bool Greeter::autologinGuestHint() const
-{
-    return false;
-}
-
-int Greeter::autologinTimeoutHint() const
-{
-    return 0;
-}
-
-bool Greeter::inAuthentication() const
-{
-    return false;
-}
-
-QString Greeter::hostname() const
-{
-    return QStringLiteral("hostname1");
-}
-
-bool Greeter::isAuthenticated() const
-{
-    Q_D(const Greeter);
-    return d->authenticated;
-}
-
-bool Greeter::connectSync()
-{
-    return true;
-}
-
-void Greeter::authenticate(const QString &username)
-{
-    Q_D(Greeter);
-
-    d->authenticated = false;
-    d->authenticationUser = username;
-    d->handleAuthenticate();
-}
-
-void Greeter::authenticateAsGuest()
-{}
-
-void Greeter::authenticateAutologin()
-{}
-
-void Greeter::authenticateRemote(const QString &session, const QString &username)
-{
-    Q_UNUSED(session)
-    Q_UNUSED(username)
-}
-
-void Greeter::cancelAuthentication()
-{
-    Q_D(Greeter);
-    d->cancelAuthentication();
-}
-
-void Greeter::setLanguage (const QString &language)
-{
-    Q_UNUSED(language)
-}
-
-bool Greeter::startSessionSync(const QString &session)
-{
-    Q_UNUSED(session)
-    return true;
-}
-
-void Greeter::respond(const QString &response)
-{
-    Q_D(Greeter);
-
-    d->handleRespond(response);
-}
-
-void Greeter::sendAuthenticationComplete()
-{
-    if (qEnvironmentVariableIsEmpty("UNITY_TESTING")) {
-        // simulate PAM's delay
-        QTimer::singleShot(1000, this, &Greeter::authenticationComplete);
-    } else {
-        Q_EMIT authenticationComplete();
-    }
-}
-
-}

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-12-23 11:04:53 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- * Copyright (C) 2010-2011 David Edmundson.
- * Copyright (C) 2010-2011 Robert Ancell
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: David Edmundson <[e-mail]>
- */
-
-#ifndef UNITY_MOCK_GREETER_H
-#define UNITY_MOCK_GREETER_H
-
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/Lightdm/liblightdm
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-namespace QLightDM
-{
-    class GreeterPrivate;
-
-class Q_DECL_EXPORT Greeter : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool authenticated READ isAuthenticated ) //NOTFIY authenticationComplete
-    Q_PROPERTY(QString authenticationUser READ authenticationUser )
-    Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
-    Q_PROPERTY(QString selectUser READ selectUserHint CONSTANT)
-    Q_PROPERTY(bool selectGuest READ selectGuestHint CONSTANT)
-
-    Q_PROPERTY(QString hostname READ hostname CONSTANT)
-    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
-
-public:
-    enum PromptType {
-        PromptTypeQuestion,
-        PromptTypeSecret
-    };
-    Q_ENUM(PromptType)
-
-    enum MessageType {
-        MessageTypeInfo,
-        MessageTypeError
-    };
-    Q_ENUM(MessageType)
-
-    explicit Greeter(QObject* parent=0);
-    virtual ~Greeter();
-
-    QString getHint(const QString &name) const;
-    QString defaultSessionHint() const;
-    bool hideUsersHint() const;
-    bool showManualLoginHint() const;
-    bool showRemoteLoginHint() const;
-    bool hasGuestAccountHint() const;
-    QString selectUserHint() const;
-    bool selectGuestHint() const;
-    QString autologinUserHint() const;
-    bool autologinGuestHint() const;
-    int autologinTimeoutHint() const;
-
-    bool inAuthentication() const;
-    bool isAuthenticated() const;
-    QString authenticationUser() const;
-    QString hostname() const;
-
-public Q_SLOTS:
-    bool connectSync();
-    void authenticate(const QString &username=QString());
-    void authenticateAsGuest();
-    void authenticateAutologin();
-    void authenticateRemote(const QString &session=QString(), const QString &username=QString());
-    void respond(const QString &response);
-    void cancelAuthentication();
-    void setLanguage (const QString &language);
-    bool startSessionSync(const QString &session=QString());
-
-Q_SIGNALS:
-    void showMessage(QString text, QLightDM::Greeter::MessageType type);
-    void showPrompt(QString text, QLightDM::Greeter::PromptType type);
-    void authenticationComplete();
-    void autologinTimerExpired();
-
-protected:
-    void sendAuthenticationComplete();
-
-private:
-    GreeterPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(Greeter)
-};
-}
-
-#endif // UNITY_MOCK_GREETER_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	2017-01-18 21:18:31 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,309 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "Greeter.h"
-#include "GreeterPrivate.h"
-#include <QFuture>
-#include <QFutureInterface>
-#include <QFutureWatcher>
-#include <QQueue>
-#include <QtConcurrent>
-#include <QVector>
-#include <security/pam_appl.h>
-
-namespace QLightDM
-{
-
-class GreeterImpl : public QObject
-{
-    Q_OBJECT
-
-    struct AppData
-    {
-        GreeterImpl *impl;
-        pam_handle *handle;
-    };
-
-    typedef QFutureInterface<QString> ResponseFuture;
-
-public:
-    explicit GreeterImpl(Greeter *parent, GreeterPrivate *greeterPrivate)
-        : QObject(parent),
-          greeter(parent),
-          greeterPrivate(greeterPrivate),
-          pamHandle(nullptr)
-    {
-        qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
-
-        connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);
-        connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
-                this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
-        // This next connect is how we pass ResponseFutures between threads
-        connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
-                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
-                Qt::BlockingQueuedConnection);
-    }
-
-    ~GreeterImpl()
-    {
-        cancelPam();
-    }
-
-    void start(QString username)
-    {
-        // Clear out any existing PAM interactions first
-        cancelPam();
-        if (pamHandle != nullptr) {
-            // While we were cancelling pam above, we processed Qt events.
-            // Which may have allowed someone to call start() on us again.
-            // In which case, we'll bail on our current start() call.
-            // This isn't racy because it's all in the same thread.
-            return;
-        }
-
-        AppData *appData = new AppData();
-        appData->impl = this;
-
-        // Now actually start a new conversation with PAM
-        pam_conv conversation;
-        conversation.conv = converseWithPam;
-        conversation.appdata_ptr = static_cast<void*>(appData);
-
-        if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
-            appData->handle = pamHandle;
-            futureWatcher.setFuture(QtConcurrent::mapped(QList<pam_handle*>() << pamHandle, authenticateWithPam));
-        } else {
-            delete appData;
-            greeterPrivate->authenticated = false;
-            Q_EMIT greeter->showMessage(QStringLiteral("Internal error: could not start PAM authentication"), QLightDM::Greeter::MessageTypeError);
-            Q_EMIT greeter->authenticationComplete();
-        }
-    }
-
-    static int authenticateWithPam(pam_handle* const& pamHandle)
-    {
-        int pamStatus = pam_authenticate(pamHandle, 0);
-        if (pamStatus == PAM_SUCCESS) {
-            pamStatus = pam_acct_mgmt(pamHandle, 0);
-        }
-        if (pamStatus == PAM_NEW_AUTHTOK_REQD) {
-            pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);
-        }
-        if (pamStatus == PAM_SUCCESS) {
-            pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);
-        }
-        return pamStatus;
-    }
-
-    static int converseWithPam(int num_msg, const pam_message** msg,
-                               pam_response** resp, void* appdata_ptr)
-    {
-        if (num_msg <= 0)
-            return PAM_CONV_ERR;
-
-        auto* tmp_response = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));
-        if (!tmp_response)
-            return PAM_CONV_ERR;
-
-        AppData *appData = static_cast<AppData*>(appdata_ptr);
-        GreeterImpl *impl = appData->impl;
-        pam_handle *handle = appData->handle;
-
-        int count;
-        QVector<ResponseFuture> responses;
-
-        for (count = 0; count < num_msg; ++count)
-        {
-            switch (msg[count]->msg_style)
-            {
-            case PAM_PROMPT_ECHO_ON:
-            {
-                QString message(msg[count]->msg);
-                responses.append(ResponseFuture());
-                responses.last().reportStarted();
-                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeQuestion, responses.last());
-                break;
-            }
-            case PAM_PROMPT_ECHO_OFF:
-            {
-                QString message(msg[count]->msg);
-                responses.append(ResponseFuture());
-                responses.last().reportStarted();
-                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeSecret, responses.last());
-                break;
-            }
-            case PAM_TEXT_INFO:
-            {
-                QString message(msg[count]->msg);
-                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeInfo);
-                break;
-            }
-            default:
-            {
-                QString message(msg[count]->msg);
-                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeError);
-                break;
-            }
-            }
-        }
-
-        int i = 0;
-        bool raise_error = false;
-
-        for (auto &response : responses)
-        {
-            pam_response* resp_item = &tmp_response[i++];
-            resp_item->resp_retcode = 0;
-            resp_item->resp = strdup(response.future().result().toUtf8());
-
-            if (!resp_item->resp)
-            {
-                raise_error = true;
-                break;
-            }
-        }
-
-        delete appData;
-
-        if (raise_error)
-        {
-            for (int i = 0; i < count; ++i)
-                free(tmp_response[i].resp);
-
-            free(tmp_response);
-            return PAM_CONV_ERR;
-        }
-        else
-        {
-            *resp = tmp_response;
-            return PAM_SUCCESS;
-        }
-    }
-
-public Q_SLOTS:
-    bool respond(QString response)
-    {
-        if (!futures.isEmpty()) {
-            futures.dequeue().reportFinished(&response);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    void cancelPam()
-    {
-        if (pamHandle != nullptr) {
-            QFuture<int> pamFuture = futureWatcher.future();
-            pam_handle *handle = pamHandle;
-            pamHandle = nullptr; // to disable normal finishPam() handling
-            pamFuture.cancel();
-
-            // Note the empty loop, we just want to clear the futures queue.
-            // Any further prompts from the pam thread will be immediately
-            // responded to/dismissed in handlePrompt().
-            while (respond(QString()));
-
-            // Now let signal/slot handling happen so the thread can finish
-            while (!pamFuture.isFinished()) {
-                QCoreApplication::processEvents();
-            }
-
-            pam_end(handle, PAM_CONV_ERR);
-        }
-    }
-
-Q_SIGNALS:
-    void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
-    void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
-
-private Q_SLOTS:
-    void finishPam()
-    {
-        if (pamHandle == nullptr) {
-            return;
-        }
-
-        int pamStatus = futureWatcher.result();
-
-        pam_end(pamHandle, pamStatus);
-        pamHandle = nullptr;
-
-        greeterPrivate->authenticated = (pamStatus == PAM_SUCCESS);
-        Q_EMIT greeter->authenticationComplete();
-    }
-
-    void handleMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type)
-    {
-        if (handle != pamHandle)
-            return;
-
-        Q_EMIT greeter->showMessage(text, type);
-    }
-
-    void handlePrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)
-    {
-        if (handle != pamHandle) {
-            future.reportResult(QString());
-            future.reportFinished();
-            return;
-        }
-
-        futures.enqueue(future);
-        Q_EMIT greeter->showPrompt(text, type);
-    }
-
-private:
-    Greeter *greeter;
-    GreeterPrivate *greeterPrivate;
-    pam_handle* pamHandle;
-    QFutureWatcher<int> futureWatcher;
-    QQueue<ResponseFuture> futures;
-};
-
-GreeterPrivate::GreeterPrivate(Greeter* parent)
-  : authenticated(false),
-    authenticationUser(),
-    m_impl(new GreeterImpl(parent, this)),
-    q_ptr(parent)
-{
-}
-
-GreeterPrivate::~GreeterPrivate()
-{
-    delete m_impl;
-}
-
-void GreeterPrivate::handleAuthenticate()
-{
-    m_impl->start(authenticationUser);
-}
-
-void GreeterPrivate::handleRespond(const QString &response)
-{
-    m_impl->respond(response);
-}
-
-void GreeterPrivate::cancelAuthentication()
-{
-    m_impl->cancelPam();
-}
-
-}
-
-#include "GreeterPrivate.moc"

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2017-01-18 21:18:31 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_MOCK_GREETER_PRIVATE_H
-#define UNITY_MOCK_GREETER_PRIVATE_H
-
-#include <QtCore/QObject>
-
-namespace QLightDM
-{
-class Greeter;
-class GreeterImpl;
-
-class GreeterPrivate
-{
-public:
-    explicit GreeterPrivate(Greeter* parent=0);
-    virtual ~GreeterPrivate();
-
-    // These variables may not be used by all subclasses, that's no problem
-    bool authenticated;
-    QString authenticationUser;
-
-    void handleAuthenticate();
-    void handleRespond(const QString &response);
-    void cancelAuthentication();
-
-protected:
-    GreeterImpl *m_impl; // if the backend needs more private data
-    Greeter * const q_ptr;
-
-private:
-    Q_DECLARE_PUBLIC(Greeter)
-};
-}
-
-#endif // UNITY_MOCK_GREETER_PRIVATE_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-12-23 11:04:53 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
-// To use the same method of setting role name that it does, we
-// set our compatibility to Qt4 here too.
-#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
-
-#include "SessionsModel.h"
-#include "SessionsModelPrivate.h"
-#include <QtCore/QDir>
-#include <QtCore/QString>
-
-namespace QLightDM
-{
-
-SessionsModel::SessionsModel(QObject* parent) :
-    QAbstractListModel(parent),
-    d_ptr(new SessionsModelPrivate(this))
-{
-    m_roleNames = QAbstractListModel::roleNames();
-    m_roleNames[KeyRole] = "key";
-    m_roleNames[TypeRole] = "type";
-}
-
-SessionsModel::~SessionsModel()
-{
-    delete d_ptr;
-}
-
-QVariant SessionsModel::data(const QModelIndex& index, int role) const
-{
-    Q_D(const SessionsModel);
-
-    if(!index.isValid()) {
-        return QVariant();
-    }
-
-    int row = index.row();
-
-    switch (role) {
-        case QLightDM::SessionsModel::KeyRole:
-            return d->sessionItems[row].key;
-        case Qt::DisplayRole:
-            return d->sessionItems[row].name;
-        default:
-            return QVariant();
-    }
-}
-
-QHash<int, QByteArray> SessionsModel::roleNames() const
-{
-    return m_roleNames;
-}
-
-int SessionsModel::rowCount(const QModelIndex& parent) const
-{
-    Q_D(const SessionsModel);
-
-    if (parent.isValid()) {
-        return 0;
-    } else { // parent is root
-        return d->sessionItems.size();
-    }
-}
-
-} // namespace QLightDM

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2016-12-23 11:04:53 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef UNITY_INTEGRATED_SESSIONSMODEL_H
-#define UNITY_INTEGRATED_SESSIONSMODEL_H
-
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QString>
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-// This is taken from liblightdm and modified to confirm to our syle conventions
-namespace QLightDM
-{
-class SessionsModelPrivate;
-
-class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
-    {
-        Q_OBJECT
-
-    public:
-
-        enum SessionModelRoles {
-            //name is exposed as Qt::DisplayRole
-            //comment is exposed as Qt::TooltipRole
-            KeyRole = Qt::UserRole,
-            IdRole = KeyRole, /** Deprecated */
-            TypeRole
-        };
-        Q_ENUM(SessionModelRoles)
-
-        enum SessionType {
-            LocalSessions,
-            RemoteSessions
-        };
-        Q_ENUM(SessionType)
-
-        explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
-        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
-        virtual ~SessionsModel();
-
-        QHash<int, QByteArray> roleNames() const override;
-        int rowCount(const QModelIndex& parent) const override;
-        QVariant data(const QModelIndex& index, int role) const override;
-
-    protected:
-        SessionsModelPrivate* const d_ptr;
-
-    private:
-        QHash<int, QByteArray> m_roleNames;
-        Q_DECLARE_PRIVATE(SessionsModel)
-    };
-}
-
-#endif // UNITY_INTEGRATED_SESSIONSMODEL_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-06-24 15:47:41 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "SessionsModelPrivate.h"
-
-#include <QDir>
-#include <QSettings>
-#include <QStringList>
-
-namespace QLightDM
-{
-
-SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
-  : q_ptr(parent)
-{
-    // Since this model is never visible, as there is only 1 session,
-    // just use the session name as the key
-    QString sessionName = qgetenv("XDG_SESSION_DESKTOP");
-    sessionItems.append({sessionName, "", sessionName, ""});
-}
-
-} // namespace QLightDM

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	2016-06-23 16:00:11 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
-#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
-
-#include <QtCore/QList>
-#include <QtCore/QString>
-
-namespace QLightDM
-{
-class SessionsModel;
-
-class SessionItem
-{
-public:
-    QString key;
-    QString type; // unused
-    QString name;
-    QString comment; // unused
-};
-
-class SessionsModelPrivate
-{
-public:
-    explicit SessionsModelPrivate(SessionsModel* parent=0);
-    virtual ~SessionsModelPrivate() = default;
-
-    QList<SessionItem> sessionItems;
-
-protected:
-    SessionsModel* const q_ptr;
-
-private:
-    Q_DECLARE_PUBLIC(SessionsModel)
-};
-
-} // namespace QLightDM
-
-#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-08-08 14:15:49 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2013-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/Lightdm/liblightdm
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
-// To use the same method of setting role name that it does, we
-// set our compatibility to Qt4 here too.
-#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
-
-#include "UsersModel.h"
-#include "UsersModelPrivate.h"
-#include <QtCore/QDir>
-#include <QtCore/QString>
-#include <QtGui/QIcon>
-
-namespace QLightDM
-{
-
-UsersModel::UsersModel(QObject *parent) :
-    QAbstractListModel(parent),
-    d_ptr(new UsersModelPrivate(this))
-{
-    // Extend roleNames (we want to keep the "display" role)
-    QHash<int, QByteArray> roles = roleNames();
-    roles[NameRole] = "name";
-    roles[RealNameRole] = "realName";
-    roles[LoggedInRole] = "loggedIn";
-    roles[BackgroundRole] = "background";
-    roles[BackgroundPathRole] = "backgroundPath";
-    roles[SessionRole] = "session";
-    roles[HasMessagesRole] = "hasMessages";
-    roles[ImagePathRole] = "imagePath";
-    roles[UidRole] = "uid";
-    setRoleNames(roles);
-
-    connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
-        QModelIndex index = createIndex(i, 0);
-        Q_EMIT dataChanged(index, index);
-    });
-}
-
-int UsersModel::rowCount(const QModelIndex &parent) const
-{
-    Q_D(const UsersModel);
-
-    if (parent.isValid()) {
-        return 0;
-    } else { // parent is root
-        return d->entries.size();
-    }
-}
-
-QVariant UsersModel::data(const QModelIndex &index, int role) const
-{
-    Q_D(const UsersModel);
-
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    int row = index.row();
-    switch (role) {
-    case Qt::DisplayRole:
-        return d->entries[row].real_name;
-    case Qt::DecorationRole:
-        return QIcon();
-    case UsersModel::NameRole:
-        return d->entries[row].username;
-    case UsersModel::RealNameRole:
-        return d->entries[row].real_name;
-    case UsersModel::SessionRole:
-        return d->entries[row].session;
-    case UsersModel::LoggedInRole:
-        return d->entries[row].is_active;
-    case UsersModel::BackgroundRole:
-        return QPixmap(d->entries[row].background);
-    case UsersModel::BackgroundPathRole:
-        return d->entries[row].background;
-    case UsersModel::HasMessagesRole:
-        return d->entries[row].has_messages;
-    case UsersModel::ImagePathRole:
-        return "";
-    case UsersModel::UidRole:
-        return d->entries[row].uid;
-    default:
-        return QVariant();
-    }
-}
-
-}

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2016-12-23 11:04:53 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- * Copyright (C) 2010-2011 David Edmundson.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: David Edmundson <[e-mail]>
- */
-
-#ifndef UNITY_MOCK_USERSMODEL_H
-#define UNITY_MOCK_USERSMODEL_H
-
-#include <QtCore/QString>
-#include <QtCore/QSharedDataPointer>
-#include <QAbstractListModel>
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/Lightdm/liblightdm
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-namespace QLightDM
-{
-class UsersModelPrivate;
-
-class Q_DECL_EXPORT UsersModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    explicit UsersModel(QObject *parent = 0);
-    virtual ~UsersModel() = default;
-
-    enum UserModelRoles {NameRole = Qt::UserRole,
-                         RealNameRole,
-                         LoggedInRole,
-                         BackgroundRole,
-                         SessionRole,
-                         HasMessagesRole,
-                         ImagePathRole,
-                         BackgroundPathRole,
-                         UidRole
-    };
-    Q_ENUM(UserModelRoles)
-
-    int rowCount(const QModelIndex &parent) const override;
-    QVariant data(const QModelIndex &index, int role) const override;
-
-private:
-    UsersModelPrivate * const d_ptr;
-    Q_DECLARE_PRIVATE(UsersModel)
-};
-
-}
-
-#endif // UNITY_MOCK_USERSMODEL_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-07-05 13:52:07 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2013-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "UsersModelPrivate.h"
-
-#include "AccountsServiceDBusAdaptor.h"
-#include "UsersModel.h"
-
-#include <glib.h>
-#include <QDebug>
-#include <QDir>
-#include <QSettings>
-#include <QStringList>
-#include <unistd.h>
-
-namespace QLightDM
-{
-
-UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
-  : QObject(parent),
-    q_ptr(parent),
-    m_service(new AccountsServiceDBusAdaptor(this))
-{
-    QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
-    QString currentUser = g_get_user_name();
-    uid_t currentUid = getuid();
-
-    if (demoFile.exists()) {
-        QSettings settings(demoFile.filePath(), QSettings::NativeFormat);
-        QStringList users = settings.value(QStringLiteral("users"), QStringList() << currentUser).toStringList();
-
-        entries.reserve(users.count());
-        Q_FOREACH(const QString &user, users)
-        {
-            QString name = settings.value(user + "/name", user).toString();
-            entries.append({user, name, 0, 0, false, false, 0, 0, currentUid++});
-        }
-    } else {
-        entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});
-
-        connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
-                this, [this](const QString &user) {
-            if (user == entries[0].username) {
-                updateName(true);
-            }
-        });
-        updateName(false);
-    }
-}
-
-void UsersModelPrivate::updateName(bool async)
-{
-    auto pendingReply = m_service->getUserPropertyAsync(entries[0].username,
-                                                        QStringLiteral("org.freedesktop.Accounts.User"),
-                                                        QStringLiteral("RealName"));
-    auto *watcher = new QDBusPendingCallWatcher(pendingReply, this);
-
-    connect(watcher, &QDBusPendingCallWatcher::finished,
-            this, [this](QDBusPendingCallWatcher* watcher) {
-
-        QDBusPendingReply<QVariant> reply = *watcher;
-        watcher->deleteLater();
-        if (reply.isError()) {
-            qWarning() << "Failed to get 'RealName' property - " << reply.error().message();
-            return;
-        }
-
-        const QString realName = reply.value().toString();
-        if (entries[0].real_name != realName) {
-            entries[0].real_name = realName;
-            Q_EMIT dataChanged(0);
-        }
-    });
-    if (!async) {
-        watcher->waitForFinished();
-    }
-}
-
-}

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-06-27 14:51:40 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2013-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
-#define UNITY_MOCK_USERSMODEL_PRIVATE_H
-
-#include <QList>
-#include <QObject>
-#include <QString>
-
-class AccountsServiceDBusAdaptor;
-
-namespace QLightDM
-{
-class UsersModel;
-
-class Entry
-{
-public:
-    QString username;
-    QString real_name;
-    QString background;
-    QString layouts;
-    bool is_active;
-    bool has_messages;
-    QString session;
-    QString infographic;
-    uid_t uid;
-};
-
-class UsersModelPrivate : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit UsersModelPrivate(UsersModel *parent = 0);
-    virtual ~UsersModelPrivate() = default;
-
-    QList<Entry> entries;
-
-Q_SIGNALS:
-    void dataChanged(int);
-
-protected:
-    UsersModel * const q_ptr;
-
-private:
-    Q_DECLARE_PUBLIC(UsersModel)
-
-    void updateName(bool async);
-
-    AccountsServiceDBusAdaptor *m_service;
-};
-
-}
-
-#endif // UNITY_MOCK_USERSMODEL_PRIVATE_H

=== removed file 'plugins/LightDM/IntegratedLightDM/qmldir'
--- plugins/LightDM/IntegratedLightDM/qmldir	2016-02-03 23:45:45 +0000
+++ plugins/LightDM/IntegratedLightDM/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-module LightDM.IntegratedLightDM
-plugin IntegratedLightDM-qml
-typeinfo IntegratedLightDM.qmltypes

=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2017-01-19 15:37:24 +0000
+++ plugins/LightDM/plugin.cpp	2017-01-26 16:33:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013,2015 Canonical, Ltd.
+ * Copyright (C) 2012-2017 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,35 +65,22 @@
     return new UsersModel();
 }
 
-static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *)
 {
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return UserMetricsOutput::UserMetrics::getInstance();
+    auto instance = UserMetricsOutput::UserMetrics::getInstance();
+    engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
+    return instance;
 }
 
-void PLUGIN_CLASSNAME::registerTypes(const char *uri)
+void LightDM::registerTypes(const char *uri)
 {
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<UserMetricsOutput::ColorTheme>();
 
-#if defined INTEGRATED_LIGHTDM
-    Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));
-    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
-#elif defined FULL_LIGHTDM
-    Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));
+    Q_ASSERT(uri == QLatin1String("LightDM"));
     qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);
-#else
-    #error No library defined in LightDM plugin
-#endif
-
+    qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
     qmlRegisterSingletonType<PromptsModel>(uri, 0, 1, "Prompts", prompts_provider);
-
     qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
-    qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
-
     qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
-    qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
-
-    qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
 }

=== modified file 'plugins/LightDM/plugin.h'
--- plugins/LightDM/plugin.h	2016-12-19 19:55:07 +0000
+++ plugins/LightDM/plugin.h	2017-01-26 16:33:43 +0000
@@ -21,7 +21,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class PLUGIN_CLASSNAME : public QQmlExtensionPlugin
+class LightDM : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

=== renamed file 'plugins/LightDM/FullLightDM/qmldir' => 'plugins/LightDM/qmldir'
--- plugins/LightDM/FullLightDM/qmldir	2016-12-19 19:55:07 +0000
+++ plugins/LightDM/qmldir	2017-01-26 16:33:43 +0000
@@ -1,3 +1,2 @@
-module LightDM.FullLightDM
-plugin FullLightDM-qml
-typeinfo FullLightDM.qmltypes
+module LightDM
+plugin LightDM-qml

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2016-12-19 19:55:07 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2017-01-26 16:33:43 +0000
@@ -337,58 +337,16 @@
     // user session.
     Q_EMIT LockRequested();
     Q_EMIT lockRequested();
+    Q_EMIT Locked();
 }
 
 void DBusUnitySessionService::Lock()
 {
     // Normal lock (with animation, as compared to PromptLock above).  Usually
     // used by indicator-session to lock the session in place.
-    //
-    // FIXME: We also -- as a bit of a hack around indicator-session not fully
-    // supporting a phone profile -- switch to greeter here.  The unity7 flow is
-    // that the user chooses "Lock/Switch" from the indicator, and then can go
-    // to greeter by selecting "Switch" again from the indicator, which is now
-    // exposed by the desktop_lockscreen profile.  But since in unity8, we try
-    // to expose most things all the time, we don't use the separate lockscreen
-    // profile.  Instead, we just go directly to the greeter the first time
-    // a user presses "Lock/Switch".  This isn't what this DBus call is
-    // supposed to do, but we can live with it for now.
-    //
-    // Here's a bug about indicator-session growing a converged Touch profile:
-    // https://launchpad.net/bugs/1557716
-    //
-    // We only do this here in the animated-lock call because that's the only
-    // time the indicator locks without also asking the display manager to
-    // switch sessions on us.  And since we are switching screens, we also
-    // don't bother respecting the animate request, simply doing a PromptLock.
+    // Though here we don't really worry about the difference and just call
+    // PromptLock.
     PromptLock();
-    switchToGreeter();
-}
-
-void DBusUnitySessionService::switchToGreeter()
-{
-    // lock the session using the org.freedesktop.DisplayManager system DBUS service
-    const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
-    QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DisplayManager"),
-                                                      sessionPath,
-                                                      QStringLiteral("org.freedesktop.DisplayManager.Session"),
-                                                      QStringLiteral("Lock"));
-
-    QDBusPendingCall pendingCall = QDBusConnection::SM_BUSNAME().asyncCall(msg);
-    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);
-    connect(watcher, &QDBusPendingCallWatcher::finished,
-        this, [this](QDBusPendingCallWatcher* watcher) {
-
-        QDBusPendingReply<void> reply = *watcher;
-        watcher->deleteLater();
-        if (reply.isError()) {
-            qWarning() << "Lock call failed" << reply.error().message();
-            return;
-        }
-
-        // emit Locked when the call succeeds
-        Q_EMIT Locked();
-    });
 }
 
 void DBusUnitySessionService::doUnlock()

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.h'
--- plugins/Unity/Session/dbusunitysessionservice.h	2016-12-19 19:55:07 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.h	2017-01-26 16:33:43 +0000
@@ -262,9 +262,6 @@
 
 private Q_SLOTS:
     void doUnlock();
-
-private:
-    void switchToGreeter();
 };
 
 class DBusGnomeSessionManagerWrapper : public UnityDBusObject

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2017-01-24 07:39:33 +0000
+++ qml/Components/Dialogs.qml	2017-01-26 16:33:43 +0000
@@ -19,10 +19,10 @@
 import Unity.Application 0.1
 import Unity.Session 0.1
 import GlobalShortcut 1.0
+import LightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Unity.Platform 1.0
 import Utils 0.1
-import "../Greeter"
 
 MouseArea {
     id: root
@@ -116,17 +116,17 @@
 
     GlobalShortcut { // lock screen
         shortcut: Qt.Key_ScreenSaver
-        onTriggered: LightDMService.greeter.showGreeter()
+        onTriggered: LightDM.Greeter.showGreeter()
     }
 
     GlobalShortcut { // lock screen
         shortcut: Qt.ControlModifier|Qt.AltModifier|Qt.Key_L
-        onTriggered: LightDMService.greeter.showGreeter()
+        onTriggered: LightDM.Greeter.showGreeter()
     }
 
     GlobalShortcut { // lock screen
         shortcut: Qt.MetaModifier|Qt.Key_L
-        onTriggered: LightDMService.greeter.showGreeter()
+        onTriggered: LightDM.Greeter.showGreeter()
     }
 
     QtObject {
@@ -180,7 +180,7 @@
                 width: parent.width
                 text: i18n.ctr("Button: Lock the system", "Lock")
                 onClicked: {
-                    LightDMService.greeter.showGreeter()
+                    LightDM.Greeter.showGreeter()
                     logoutDialog.hide();
                 }
                 Component.onCompleted: if (root.hasKeyboard) forceActiveFocus(Qt.TabFocusReason)

=== removed file 'qml/Greeter/FullLightDMImpl.qml'
--- qml/Greeter/FullLightDMImpl.qml	2017-01-12 20:59:23 +0000
+++ qml/Greeter/FullLightDMImpl.qml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import LightDM.FullLightDM 0.1 as LightDM
-
-Item{
-    id: implementation
-
-    property var greeter: LightDM.Greeter
-    property var infographic: LightDM.Infographic
-    property var prompts: LightDM.Prompts
-    property var sessions: LightDM.Sessions
-    property var sessionRoles: LightDM.SessionRoles
-    property var users: LightDM.Users
-    property var userRoles: LightDM.UserRoles
-
-}

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2017-01-19 15:37:24 +0000
+++ qml/Greeter/Greeter.qml	2017-01-26 16:33:43 +0000
@@ -18,13 +18,13 @@
 import AccountsService 0.1
 import Biometryd 0.0
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import Powerd 0.1
 import Ubuntu.Components 1.3
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
 import Unity.Session 0.1
 
-import "." 0.1
 import "../Components"
 
 Showable {
@@ -51,7 +51,7 @@
     readonly property bool hasLockedApp: lockedApp !== ""
 
     property bool forcedUnlock
-    readonly property bool locked: LightDMService.greeter.active && !LightDMService.greeter.authenticated && !forcedUnlock
+    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
 
     property bool tabletMode
     property url viewSource // only used for testing
@@ -137,24 +137,23 @@
     }
 
     function sessionToStart() {
-        for (var i = 0; i < LightDMService.sessions.count; i++) {
-            var session = LightDMService.sessions.data(i,
-                LightDMService.sessionRoles.KeyRole);
+        for (var i = 0; i < LightDM.Sessions.count; i++) {
+            var session = LightDM.Sessions.data(i, LightDM.Sessions.KeyRole);
             if (loader.item.sessionToStart === session) {
                 return session;
             }
         }
 
-        return LightDMService.greeter.defaultSession;
+        return LightDM.Greeter.defaultSession;
     }
 
     QtObject {
         id: d
 
-        readonly property bool multiUser: LightDMService.users.count > 1
-        readonly property int selectUserIndex: d.getUserIndex(LightDMService.greeter.selectUser)
+        readonly property bool multiUser: LightDM.Users.count > 1
+        readonly property int selectUserIndex: d.getUserIndex(LightDM.Greeter.selectUser)
         property int currentIndex: Math.max(selectUserIndex, 0)
-        readonly property bool waiting: LightDMService.prompts.count == 0 && !root.forcedUnlock
+        readonly property bool waiting: LightDM.Prompts.count == 0 && !root.forcedUnlock
         property bool isLockscreen // true when we are locking an active session, rather than first user login
         readonly property bool secureFingerprint: isLockscreen &&
                                                   AccountsService.failedFingerprintLogins <
@@ -180,8 +179,8 @@
                 return -1;
 
             // Find index for requested user, if it exists
-            for (var i = 0; i < LightDMService.users.count; i++) {
-                if (username === LightDMService.users.data(i, LightDMService.userRoles.NameRole)) {
+            for (var i = 0; i < LightDM.Users.count; i++) {
+                if (username === LightDM.Users.data(i, LightDM.Users.NameRole)) {
                     return i;
                 }
             }
@@ -190,29 +189,31 @@
         }
 
         function selectUser(index) {
-            if (index < 0 || index >= LightDMService.users.count)
+            if (index < 0 || index >= LightDM.Users.count)
                 return;
             currentIndex = index;
-            var user = LightDMService.users.data(index, LightDMService.userRoles.NameRole);
+            var user = LightDM.Users.data(index, LightDM.Users.NameRole);
             AccountsService.user = user;
             LauncherModel.setUser(user);
-            LightDMService.greeter.authenticate(user); // always resets auth state
+            LightDM.Greeter.authenticate(user); // always resets auth state
         }
 
         function hideView() {
             if (loader.item) {
                 loader.item.enabled = false; // drop OSK and prevent interaction
                 loader.item.hide();
+                sessionStarted();
             }
         }
 
         function login() {
-            if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
-                sessionStarted();
-                hideView();
-            } else if (loader.item) {
+            if (!LightDM.Greeter.startSessionSync(root.sessionToStart())) {
                 loader.item.notifyAuthenticationFailed();
+                selectUser(currentIndex);
             }
+
+            // If successful as a lockscreen, we don't need to hide ourselves.
+            // logind will tell us to unlock if our current user logged in.
         }
 
         function startUnlock(toTheRight) {
@@ -234,7 +235,7 @@
 
         function showFingerprintMessage(msg) {
             d.selectUser(d.currentIndex);
-            LightDMService.prompts.prepend(msg, LightDMService.prompts.Error);
+            LightDM.Prompts.prepend(msg, LightDM.Prompts.Error);
             if (loader.item) {
                 loader.item.showErrorMessage(msg);
                 loader.item.notifyAuthenticationFailed();
@@ -356,7 +357,7 @@
             root.lockedApp = "";
             item.forceActiveFocus();
             d.selectUser(d.currentIndex);
-            LightDMService.infographic.readyForDataChange();
+            LightDM.Infographic.readyForDataChange();
         }
 
         Connections {
@@ -366,7 +367,7 @@
             }
             onResponded: {
                 if (root.locked) {
-                    LightDMService.greeter.respond(response);
+                    LightDM.Greeter.respond(response);
                 } else {
                     d.login();
                 }
@@ -443,18 +444,18 @@
         Binding {
             target: loader.item
             property: "userModel"
-            value: LightDMService.users
+            value: LightDM.Users
         }
 
         Binding {
             target: loader.item
             property: "infographicModel"
-            value: LightDMService.infographic
+            value: LightDM.Infographic
         }
     }
 
     Connections {
-        target: LightDMService.greeter
+        target: LightDM.Greeter
 
         onShowGreeter: root.forceShow()
         onHideGreeter: root.forcedUnlock = true
@@ -508,20 +509,20 @@
     }
 
     Binding {
-        target: LightDMService.greeter
+        target: LightDM.Greeter
         property: "active"
         value: root.active
     }
 
     Binding {
-        target: LightDMService.infographic
+        target: LightDM.Infographic
         property: "username"
-        value: AccountsService.statsWelcomeScreen ? LightDMService.users.data(d.currentIndex, LightDMService.userRoles.NameRole) : ""
+        value: AccountsService.statsWelcomeScreen ? LightDM.Users.data(d.currentIndex, LightDM.Users.NameRole) : ""
     }
 
     Connections {
         target: i18n
-        onLanguageChanged: LightDMService.infographic.readyForDataChange()
+        onLanguageChanged: LightDM.Infographic.readyForDataChange()
     }
 
     Observer {
@@ -573,7 +574,7 @@
                 failOperation("fingerprint reader is locked");
                 return;
             }
-            if (result !== LightDMService.users.data(d.currentIndex, LightDMService.userRoles.UidRole)) {
+            if (result !== LightDM.Users.data(d.currentIndex, LightDM.Users.UidRole)) {
                 AccountsService.failedFingerprintLogins++;
                 failOperation("not the selected user");
                 return;

=== removed file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	2017-01-12 20:59:23 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import LightDM.IntegratedLightDM 0.1 as LightDM
-
-Item{
-    id: implementation
-
-    property var greeter: LightDM.Greeter
-    property var infographic: LightDM.Infographic
-    property var prompts: LightDM.Prompts
-    property var sessions: LightDM.Sessions
-    property var sessionRoles: LightDM.SessionRoles
-    property var users: LightDM.Users
-    property var userRoles: LightDM.UserRoles
-}

=== removed file 'qml/Greeter/LightDMService.qml'
--- qml/Greeter/LightDMService.qml	2017-01-12 20:59:23 +0000
+++ qml/Greeter/LightDMService.qml	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Lightweight wrapper that allows for loading integrated/real LightDM
- * plugin
- */
-
-pragma Singleton
-import QtQuick 2.4
-
-Loader {
-    id: loader
-
-    property var greeter: d.valid ? loader.item.greeter : null
-    property var infographic: d.valid ? loader.item.infographic : null
-    property var prompts: d.valid ? loader.item.prompts : null
-    property var sessions: d.valid ? loader.item.sessions : null
-    property var sessionRoles: d.valid ? loader.item.sessionRoles : null
-    property var users: d.valid ? loader.item.users : null
-    property var userRoles: d.valid ? loader.item.userRoles : null
-
-    // This trickery handles cases where applicationArguments aren't provided
-    // such as during testing
-    property var fullLightDM: {
-        if (typeof applicationArguments === "undefined" ||
-                applicationArguments.mode === "greeter") {
-            return true;
-        }
-        return false;
-    }
-
-    source:  fullLightDM ?
-        "FullLightDMImpl.qml" : "IntegratedLightDMImpl.qml"
-
-    QtObject {
-        id: d
-
-        property bool valid: loader.item !== null
-    }
-}

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2017-01-24 07:40:40 +0000
+++ qml/Greeter/LoginList.qml	2017-01-26 16:33:43 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.4
 import QtGraphicalEffects 1.0
 import Ubuntu.Components 1.3
+import LightDM 0.1 as LightDM
 import "../Components"
-import "." 0.1
 
 StyledItem {
     id: root
@@ -155,8 +155,8 @@
                 }
                 text: userList.currentIndex === index
                       && name === "*other"
-                      && LightDMService.greeter.authenticationUser !== ""
-                      ?  LightDMService.greeter.authenticationUser : realName
+                      && LightDM.Greeter.authenticationUser !== ""
+                      ?  LightDM.Greeter.authenticationUser : realName
                 color: userList.currentIndex !== index ? theme.palette.normal.raised
                                                        : theme.palette.normal.raisedText
 
@@ -208,8 +208,8 @@
 
         readonly property alias icon: badge.source
 
-        visible: LightDMService.sessions.count > 1 &&
-            !LightDMService.users.data(userList.currentIndex, LightDMService.userRoles.LoggedInRole)
+        visible: LightDM.Sessions.count > 1 &&
+            !LightDM.Users.data(userList.currentIndex, LightDM.Users.LoggedInRole)
 
         height: units.gu(3.5)
         width: units.gu(3.5)
@@ -240,7 +240,7 @@
             anchors.margins: units.dp(3)
             keyColor: "#ffffff" // icon providers give us white icons
             color: theme.palette.normal.raisedSecondaryText
-            source: LightDMService.sessions.iconUrl(root.currentSession)
+            source: LightDM.Sessions.iconUrl(root.currentSession)
         }
 
         Keys.onReturnPressed: {
@@ -255,9 +255,9 @@
         // Refresh the icon path if looking at different places at runtime
         // this is mainly for testing
         Connections {
-            target: LightDMService.sessions
+            target: LightDM.Sessions
             onIconSearchDirectoriesChanged: {
-                badge.source = LightDMService.sessions.iconUrl(root.currentSession)
+                badge.source = LightDM.Sessions.iconUrl(root.currentSession)
             }
         }
     }
@@ -290,7 +290,7 @@
         }
 
         Connections {
-            target: LightDMService.prompts
+            target: LightDM.Prompts
             onModelReset: promptList.interactive = true
         }
     }

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2017-01-19 15:37:24 +0000
+++ qml/Greeter/NarrowView.qml	2017-01-26 16:33:43 +0000
@@ -34,7 +34,7 @@
     property alias alphanumeric: loginList.alphanumeric
     property alias userModel: loginList.model
     property alias infographicModel: coverPage.infographicModel
-    property string sessionToStart
+    property alias sessionToStart: loginList.currentSession
     property bool waiting
     readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
     readonly property bool required: coverPage.required || lockscreen.required

=== modified file 'qml/Greeter/PromptList.qml'
--- qml/Greeter/PromptList.qml	2017-01-13 17:31:51 +0000
+++ qml/Greeter/PromptList.qml	2017-01-26 16:33:43 +0000
@@ -16,8 +16,8 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import LightDM 0.1 as LightDM
 import "../Components"
-import "." 0.1
 
 FocusScope {
     id: root
@@ -58,13 +58,13 @@
 
         Repeater {
             id: repeater
-            model: LightDMService.prompts
+            model: LightDM.Prompts
 
             delegate: Loader {
                 id: loader
 
-                readonly property bool isLabel: model.type == LightDMService.prompts.Message ||
-                                                model.type == LightDMService.prompts.Error
+                readonly property bool isLabel: model.type == LightDM.Prompts.Message ||
+                                                model.type == LightDM.Prompts.Error
                 readonly property var modelData: model
 
                 sourceComponent: isLabel ? infoLabel : greeterPrompt
@@ -99,7 +99,7 @@
             property var model
             readonly property bool isPrompt: false
 
-            color: model.type === LightDMService.prompts.Message ? theme.palette.normal.raisedText
+            color: model.type === LightDM.Prompts.Message ? theme.palette.normal.raisedText
                                                           : theme.palette.normal.negative
             fontSize: "small"
             textFormat: Text.PlainText
@@ -121,8 +121,8 @@
 
             interactive: root.interactive
             isAlphanumeric: model.text !== "" || root.alphanumeric
-            isPrompt: model.type !== LightDMService.prompts.Button
-            isSecret: model.type === LightDMService.prompts.Secret
+            isPrompt: model.type !== LightDM.Prompts.Button
+            isSecret: model.type === LightDM.Prompts.Secret
             text: model.text ? model.text : (isAlphanumeric ? i18n.tr("Passphrase") : i18n.tr("Passcode"))
 
             onClicked: root.clicked()

=== modified file 'qml/Greeter/SessionsList.qml'
--- qml/Greeter/SessionsList.qml	2016-12-19 19:55:07 +0000
+++ qml/Greeter/SessionsList.qml	2017-01-26 16:33:43 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3
-import "." 0.1
+import LightDM 0.1 as LightDM
 import "../Components"
 
 Item {
@@ -43,8 +43,8 @@
     }
 
     function currentKey() {
-        var session = LightDMService.sessions.data(
-            sessionsList.currentIndex, LightDMService.sessionRoles.KeyRole)
+        var session = LightDM.Sessions.data(
+            sessionsList.currentIndex, LightDM.Sessions.KeyRole)
         return session;
     }
 
@@ -111,7 +111,7 @@
 
             boundsBehavior: Flickable.StopAtBounds
 
-            model: LightDMService.sessions
+            model: LightDM.Sessions
             header: ListItemLayout {
                 id: header
 

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2017-01-23 14:28:42 +0000
+++ qml/Greeter/WideView.qml	2017-01-26 16:33:43 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import "." 0.1
+import LightDM 0.1 as LightDM
 
 FocusScope {
     id: root
@@ -139,7 +139,7 @@
             Component.onCompleted: setCurrentSession()
 
             function setCurrentSession() {
-                currentSession = LightDMService.users.data(currentIndex, LightDMService.userRoles.SessionRole);
+                currentSession = LightDM.Users.data(currentIndex, LightDM.Users.SessionRole);
             }
         }
 

=== removed file 'qml/Greeter/qmldir'
--- qml/Greeter/qmldir	2015-10-20 00:59:12 +0000
+++ qml/Greeter/qmldir	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-singleton LightDMService 0.1 LightDMService.qml

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2017-01-24 07:43:54 +0000
+++ qml/Shell.qml	2017-01-26 16:33:43 +0000
@@ -27,6 +27,7 @@
 import GlobalShortcut 1.0 // has to be before Utils, because of WindowInputFilter
 import GSettings 1.0
 import ImageCache 0.1
+import LightDM 0.1 as LightDM
 import Utils 0.1
 import Powerd 0.1
 import SessionBroadcast 0.1
@@ -202,6 +203,12 @@
         value: ApplicationManager
     }
 
+    Binding {
+        target: AccountsService
+        property: "greeterMode"
+        value: shell.mode === "greeter"
+    }
+
     Component.onCompleted: {
         finishStartUpTimer.start();
     }
@@ -528,7 +535,7 @@
             readonly property bool focusedSurfaceIsFullscreen: topLevelSurfaceList.focusedWindow
                 ? topLevelSurfaceList.focusedWindow.state === Mir.FullscreenState
                 : false
-            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0)
+            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDM.Greeter.active && launcher.progress === 0)
                             || greeter.hasLockedApp
             greeterShown: greeter && greeter.shown
         }

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2017-01-19 15:23:58 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2017-01-26 16:33:43 +0000
@@ -26,6 +26,7 @@
     m_enableLauncherWhileLocked(true),
     m_enableIndicatorsWhileLocked(true),
     m_backgroundFile(),
+    m_greeterMode(true),
     m_statsWelcomeScreen(true),
     m_failedLogins(0),
     m_failedFingerprintLogins(0),
@@ -50,6 +51,19 @@
     Q_EMIT backgroundFileChanged();
 }
 
+bool AccountsService::greeterMode() const
+{
+    return m_greeterMode;
+}
+
+void AccountsService::setGreeterMode(bool greeterMode)
+{
+    if (m_greeterMode != greeterMode) {
+        m_greeterMode = greeterMode;
+        Q_EMIT greeterModeChanged();
+    }
+}
+
 bool AccountsService::demoEdges() const
 {
     return m_demoEdges;

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2017-01-18 00:25:13 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2017-01-26 16:33:43 +0000
@@ -30,6 +30,10 @@
                 READ user
                 WRITE setUser
                 NOTIFY userChanged)
+    Q_PROPERTY (bool greeterMode
+                READ greeterMode
+                WRITE setGreeterMode
+                NOTIFY greeterModeChanged)
     Q_PROPERTY (bool demoEdges
                 READ demoEdges
                 WRITE setDemoEdges
@@ -98,6 +102,8 @@
 
     QString user() const;
     void setUser(const QString &user);
+    bool greeterMode() const;
+    void setGreeterMode(bool greeterMode);
     bool demoEdges() const;
     void setDemoEdges(bool demoEdges);
     QStringList demoEdgesCompleted() const;
@@ -132,6 +138,7 @@
 
 Q_SIGNALS:
     void userChanged();
+    void greeterModeChanged();
     void demoEdgesChanged();
     void demoEdgesCompletedChanged();
     void enableFingerprintIdentificationChanged();
@@ -154,6 +161,7 @@
     bool m_enableIndicatorsWhileLocked;
     QString m_backgroundFile;
     QString m_user;
+    bool m_greeterMode;
     bool m_statsWelcomeScreen;
     uint m_failedLogins;
     uint m_failedFingerprintLogins;

=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
--- tests/mocks/AccountsService/CMakeLists.txt	2017-01-19 15:37:24 +0000
+++ tests/mocks/AccountsService/CMakeLists.txt	2017-01-26 16:33:43 +0000
@@ -1,10 +1,14 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM
     ${CMAKE_SOURCE_DIR}/plugins/Utils
     )
 
+include_directories(
+    SYSTEM
+    ${LIBLIGHTDM_INCLUDE_DIRS}
+    )
+
 add_library(MockAccountsService-qml MODULE
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/PromptsModel.cpp

=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
--- tests/mocks/libusermetrics/UserMetrics.cpp	2017-01-18 00:25:13 +0000
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2017-01-26 16:33:43 +0000
@@ -301,7 +301,7 @@
         QSharedPointer<UserMetricsData> data(
                 new UserMetricsData("<b>52km</b> travelled", first, firstMonth,
                         ninth, secondMonth, this));
-        m_fakeData.insert("single", data);
+        m_fakeData.insert("has-password", data);
         m_fakeData.insert("has-pin", data);
     }
 
@@ -317,7 +317,7 @@
         QSharedPointer<UserMetricsData> data(
                 new UserMetricsData("<b>33</b> messages today", second,
                         firstMonth, eighth, secondMonth, this));
-        m_fakeData.insert("single", data);
+        m_fakeData.insert("has-password", data);
         m_fakeData.insert("has-pin", data);
     }
 
@@ -334,10 +334,8 @@
         QSharedPointer<UserMetricsData> data(
                 new UserMetricsData("<b>19</b> minutes talk time", eighth,
                         firstMonth, second, secondMonth, this));
-        m_fakeData.insert("single", data);
+        m_fakeData.insert("has-password", data);
         m_fakeData.insert("has-pin", data);
-        // Also use same data for some tablet users
-        m_fakeData.insert("has-password", data);
         m_fakeData.insert("no-password", data);
         m_fakeData.insert("empty-name", data);
     }

=== modified file 'tests/plugins/AccountsService/AccountsServer.cpp'
--- tests/plugins/AccountsService/AccountsServer.cpp	2016-12-19 19:55:07 +0000
+++ tests/plugins/AccountsService/AccountsServer.cpp	2017-01-26 16:33:43 +0000
@@ -40,6 +40,8 @@
     if (QDBusConnection::sessionBus().objectRegisteredAt(path) != nullptr)
         return true;
 
+    m_users.insert(path);
+
     auto props = new PropertiesServer(this);
     new PropertiesAdaptor(props);
     new AccountsUserAdaptor(props);
@@ -52,6 +54,15 @@
     if (QDBusConnection::sessionBus().objectRegisteredAt(path) == nullptr)
         return false;
 
+    m_users.remove(path);
     QDBusConnection::sessionBus().unregisterObject(path);
     return true;
 }
+
+void AccountsServer::RemoveAllUsers()
+{
+    Q_FOREACH(const QString &path, m_users) {
+        m_users.remove(path);
+        QDBusConnection::sessionBus().unregisterObject(path);
+    }
+}

=== modified file 'tests/plugins/AccountsService/AccountsServer.h'
--- tests/plugins/AccountsService/AccountsServer.h	2016-12-19 19:55:07 +0000
+++ tests/plugins/AccountsService/AccountsServer.h	2017-01-26 16:33:43 +0000
@@ -23,6 +23,7 @@
 #include <QDBusContext>
 #include <QDBusObjectPath>
 #include <QObject>
+#include <QSet>
 #include <QString>
 
 class AccountsServer: public QObject, protected QDBusContext
@@ -39,6 +40,10 @@
     // mock only.
     bool AddUser(const QString &user);
     bool RemoveUser(const QString &user);
+    void RemoveAllUsers();
+
+private:
+    QSet<QString> m_users;
 };
 
 #endif

=== modified file 'tests/plugins/AccountsService/client.cpp'
--- tests/plugins/AccountsService/client.cpp	2016-12-19 19:55:07 +0000
+++ tests/plugins/AccountsService/client.cpp	2017-01-26 16:33:43 +0000
@@ -26,6 +26,8 @@
 #include <QDBusReply>
 #include <QDBusMetaType>
 
+#include <glib.h>
+
 template <class T>
 QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }
 
@@ -62,11 +64,7 @@
 private Q_SLOTS:
 
     void init() {
-        QDBusReply<bool> addReply = QDBusInterface("org.freedesktop.Accounts",
-                                                   "/org/freedesktop/Accounts",
-                                                   "org.freedesktop.Accounts").call("AddUser", QTest::currentTestFunction());
-        QVERIFY(addReply.isValid());
-        QCOMPARE(addReply.value(), true);
+        addUser(QTest::currentTestFunction());
 
         m_userInterface = new QDBusInterface("org.freedesktop.Accounts",
                                              QString("/%1").arg(QTest::currentTestFunction()),
@@ -77,17 +75,46 @@
     }
 
     void cleanup() {
-        QDBusReply<bool> reply = QDBusInterface("org.freedesktop.Accounts",
+        QDBusReply<void> reply = QDBusInterface("org.freedesktop.Accounts",
                                                 "/org/freedesktop/Accounts",
-                                                "org.freedesktop.Accounts").call("RemoveUser", QTest::currentTestFunction());
+                                                "org.freedesktop.Accounts").call("RemoveAllUsers");
         QVERIFY(reply.isValid());
-        QCOMPARE(reply.value(), true);
 
         delete m_userInterface;
         m_spy.clear();
         m_mousePrimaryButtonSpy.clear();
     }
 
+    void addUser(const QString &user)
+    {
+        QDBusReply<bool> addReply = QDBusInterface("org.freedesktop.Accounts",
+                                                   "/org/freedesktop/Accounts",
+                                                   "org.freedesktop.Accounts").call("AddUser", user);
+        QVERIFY(addReply.isValid());
+        QCOMPARE(addReply.value(), true);
+    }
+
+    QVariant getASProperty(const QString &interface, const QString &key, const QString &user = QString())
+    {
+        QString ifaceUser = user;
+        if (ifaceUser.isEmpty())
+            ifaceUser = QTest::currentTestFunction();
+
+        QDBusInterface iface("org.freedesktop.Accounts",
+                             QString("/%1").arg(ifaceUser),
+                             "org.freedesktop.DBus.Properties",
+                             QDBusConnection::sessionBus());
+
+        auto message = iface.call("Get", interface, key);
+        if (message.type() == QDBusMessage::ReplyMessage) {
+            return message.arguments().first().value<QDBusVariant>().variant();
+        }
+        else {
+            qWarning() << "Could not get property" << key << ":" << message.errorMessage();
+            return QVariant();
+        }
+    }
+
     void testInvalids()
     {
         // Test various invalid calls
@@ -323,25 +350,16 @@
         QCOMPARE(message.type(), QDBusMessage::ErrorMessage);
         QCOMPARE(message.errorName(), QStringLiteral("org.freedesktop.DBus.Error.InvalidArgs"));
 
-        message = m_userInterface->call("Get",
-                                        "org.freedesktop.Accounts.User",
-                                        "RealName");
-        QCOMPARE(message.type(), QDBusMessage::ReplyMessage);
-        auto response = message.arguments().first().value<QDBusVariant>().variant().toString();
-        QCOMPARE(response, QStringLiteral(""));
+        auto response = getASProperty("org.freedesktop.Accounts.User", "RealName");
+        QCOMPARE(response.toString(), QStringLiteral(""));
 
         // Now try it via our AS wrapper and confirm it did get through, unlike above
         session.setRealName("Stallman");
 
         QCOMPARE(session.realName(), QStringLiteral("Stallman"));
 
-        message = m_userInterface->call("Get",
-                                        "org.freedesktop.Accounts.User",
-                                        "RealName");
-        QCOMPARE(message.type(), QDBusMessage::ReplyMessage);
-        response = message.arguments().first().value<QDBusVariant>().variant().toString();
-        QCOMPARE(response, QStringLiteral("Stallman"));
-
+        response = getASProperty("org.freedesktop.Accounts.User", "RealName");
+        QCOMPARE(response.toString(), QStringLiteral("Stallman"));
     }
 
     void testAsynchronousChangeForKeymaps()
@@ -367,6 +385,38 @@
         QTRY_COMPARE(session.keymaps(), result);
     }
 
+    void testGreeterMode()
+    {
+        addUser(g_get_user_name());
+        addUser("OtherUser"); // presumably will never conflict with running user
+        AccountsService session(this);
+        QVERIFY(session.greeterMode());
+
+        session.setGreeterMode(false);
+
+        // NOTE: we change real user data here, but it's a harmless change
+        session.setFailedLogins(1);
+        QCOMPARE(session.failedLogins(), 1u);
+        QCOMPARE(getASProperty("com.canonical.unity.AccountsService.Private",
+                               "FailedLogins", session.user()), QVariant(1));
+
+        // This will fail because we aren't the active user
+        session.setUser("OtherUser");
+        session.setFailedLogins(2);
+        QCOMPARE(session.failedLogins(), 2u);
+        QCOMPARE(getASProperty("com.canonical.unity.AccountsService.Private",
+                               "FailedLogins", "OtherUser"), QVariant(0));
+
+        session.setGreeterMode(true);
+
+        // But now a similar call will succeed because we're in greeter mode
+        session.setFailedLogins(3);
+        QCOMPARE(session.failedLogins(), 3u);
+        QCOMPARE(getASProperty("com.canonical.unity.AccountsService.Private",
+                               "FailedLogins", "OtherUser"), QVariant(3));
+
+    }
+
 Q_SIGNALS:
     void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
     void setMousePrimaryButtonCalled(int button);

=== modified file 'tests/plugins/AccountsService/interfaces.xml'
--- tests/plugins/AccountsService/interfaces.xml	2016-12-19 19:55:07 +0000
+++ tests/plugins/AccountsService/interfaces.xml	2017-01-26 16:33:43 +0000
@@ -36,6 +36,7 @@
       <arg name="user" type="s" direction="in" />
       <arg name="success" type="b" direction="out" />
     </method>
+    <method name="RemoveAllUsers"/>
   </interface>
   <interface name="com.ubuntu.AccountsService.Input" />
   <interface name="com.ubuntu.touch.AccountsService.SecurityPrivacy" />

=== removed file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2015-09-28 18:21:40 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(IntegratedLightDM)

=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt' => 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2017-01-19 15:37:24 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2017-01-26 16:33:43 +0000
@@ -1,54 +1,40 @@
 include_directories(
-    ${GLIB_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM
-    )
-
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/Utils
+    ${CMAKE_SOURCE_DIR}/tests/mocks/liblightdm
+    )
+
+include_directories(
+    SYSTEM
+    ${GLIB_INCLUDE_DIRS}
+    ${LIBLIGHTDM_INCLUDE_DIRS}
+    )
+
+link_libraries(
+    LightDM-qml
+    MockLightDM
+    )
+
+# DBusTest
 add_executable(GreeterDBusTestExec
     dbus.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/PromptsModel.cpp
     )
-# This add_dependencies is needed since we're linking with with -L and -l below
-# make seems to work but ninja breaks without it
-add_dependencies(GreeterDBusTestExec MockLightDM)
 qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
-target_link_libraries(GreeterDBusTestExec
-    MockLightDM
-    )
-target_include_directories(GreeterDBusTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    )
-set_target_properties(GreeterDBusTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/liblightdm")
+set_target_properties(GreeterDBusTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks/liblightdm")
 install(TARGETS GreeterDBusTestExec
-    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM/IntegratedLightDM"
+    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM"
     )
 install(FILES greeter.qml
-    DESTINATION "${SHELL_APP_DIR}/tests/plugins/LightDM/IntegratedLightDM"
+    DESTINATION "${SHELL_APP_DIR}/tests/plugins/LightDM"
     )
 add_unity8_uitest(GreeterDBus dbus-test-runner
     ARG_PREFIX "--parameter"
     ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
-    DEPENDS MockLightDM
-    )
-
-add_executable(GreeterPamTestExec
-    pam.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
-    )
-qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
-target_link_libraries(GreeterPamTestExec
-    integratedLightDM
-    )
-
-target_include_directories(GreeterPamTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm
-    )
-install(TARGETS GreeterPamTestExec
-    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM/IntegratedLightDM"
-    )
-add_qmltest_target(testGreeterPam GreeterPamTestExec COMMAND $<TARGET_FILE:GreeterPamTestExec>)
+    DEPENDS LightDM-qml;MockLightDM
+    )
 
 # SessionsModelTest
 add_executable(GreeterSessionsModelTestExec
@@ -56,21 +42,12 @@
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/SessionsModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
-add_dependencies(GreeterSessionsModelTestExec MockLightDM)
 qt5_use_modules(GreeterSessionsModelTestExec Core Test)
-target_link_libraries(GreeterSessionsModelTestExec
-    MockLightDM
-    )
-target_include_directories(GreeterSessionsModelTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/liblightdm/
-    )
 install(TARGETS GreeterSessionsModelTestExec
-    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM/IntegratedLightDM"
+    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM"
     )
-add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
-    DEPENDS MockLightDM
+add_unity8_unittest(GreeterSessions GreeterSessionsModelTestExec
+    DEPENDS LightDM-qml;MockLightDM
     )
 
 # UsersModelTest
@@ -81,24 +58,13 @@
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
-# This add_dependencies is needed since we're linking with with -L and -l below
-# make seems to work but ninja breaks without it
-add_dependencies(GreeterUsersModelTestExec MockLightDM)
 qt5_use_modules(GreeterUsersModelTestExec Core Test)
-target_link_libraries(GreeterUsersModelTestExec
-    MockLightDM
-    )
-target_include_directories(GreeterUsersModelTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/liblightdm
-    )
-set_target_properties(GreeterUsersModelTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/liblightdm")
+set_target_properties(GreeterUsersModelTestExec PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks/liblightdm")
 install(TARGETS GreeterUsersModelTestExec
-    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM/IntegratedLightDM"
+    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM"
     )
-add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
-    DEPENDS MockLightDM
+add_unity8_unittest(GreeterUsers GreeterUsersModelTestExec
+    DEPENDS LightDM-qml;MockLightDM
     )
 
 # PromptsModelTest
@@ -108,50 +74,10 @@
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/PromptsModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
-# This add_dependencies is needed since we're linking with with -L and -l below
-# make seems to work but ninja breaks without it
-add_dependencies(GreeterPromptsModelTestExec MockLightDM)
 qt5_use_modules(GreeterPromptsModelTestExec Core Test)
-target_link_libraries(GreeterPromptsModelTestExec
-    MockLightDM
-    )
-target_include_directories(GreeterPromptsModelTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/liblightdm
-    )
 install(TARGETS GreeterPromptsModelTestExec
-    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM/IntegratedLightDM"
-    )
-add_unity8_uitest(GreeterPrompts GreeterPromptsModelTestExec
-    DEPENDS MockLightDM
-    )
-
-# IntegratedTest
-add_executable(GreeterIntegratedTestExec
-    integrated.cpp
-    )
-qt5_use_modules(GreeterIntegratedTestExec Core DBus Quick Test)
-target_link_libraries(GreeterIntegratedTestExec
-    ${GLIB_LIBRARIES}
-    integratedLightDMSession
-    )
-target_include_directories(GreeterIntegratedTestExec PUBLIC
-    ${GLIB_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm
-    )
-install(TARGETS GreeterIntegratedTestExec
-    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM/IntegratedLightDM"
-    )
-add_unity8_unittest(GreeterIntegrated dbus-test-runner
-    ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/IntegratedLightDM/liblightdm/
-    ARG_PREFIX "--parameter"
-    ARGS
-        --task $<TARGET_FILE:mock-server>
-        --task-name server
-        --ignore-return
-        --task $<TARGET_FILE:GreeterIntegratedTestExec>
-        --task-name client
-        --wait-for org.freedesktop.Accounts
-    DEPENDS integratedLightDMSession
+    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/LightDM"
+    )
+add_unity8_unittest(GreeterPrompts GreeterPromptsModelTestExec
+    DEPENDS LightDM-qml;MockLightDM
     )

=== removed directory 'tests/plugins/LightDM/IntegratedLightDM'
=== removed file 'tests/plugins/LightDM/IntegratedLightDM/integrated.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/integrated.cpp	2016-05-02 18:43:06 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/integrated.cpp	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UsersModel.h"
-
-#include <glib.h>
-#include <QDBusInterface>
-#include <QDBusReply>
-#include <QtTest>
-
-class GreeterIntegratedTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-
-    void init()
-    {
-        m_accounts = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),
-                                        QStringLiteral("/org/freedesktop/Accounts"),
-                                        QStringLiteral("org.freedesktop.Accounts"),
-                                        QDBusConnection::sessionBus());
-        QDBusReply<bool> addReply = m_accounts->call(QStringLiteral("AddUser"),
-                                                     g_get_user_name());
-        QVERIFY(addReply.isValid());
-        QCOMPARE(addReply.value(), true);
-
-        m_user = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),
-                                    QStringLiteral("/%1").arg(g_get_user_name()),
-                                    QStringLiteral("org.freedesktop.DBus.Properties"),
-                                    QDBusConnection::sessionBus());
-
-        m_model = new QLightDM::UsersModel();
-        QVERIFY(m_model);
-    }
-
-    void cleanup()
-    {
-        QDBusReply<bool> addReply = m_accounts->call(QStringLiteral("RemoveUser"),
-                                                     g_get_user_name());
-        QVERIFY(addReply.isValid());
-        QCOMPARE(addReply.value(), true);
-
-        delete m_model;
-        delete m_accounts;
-        delete m_user;
-    }
-
-    void testWatchRealName()
-    {
-        auto index = m_model->index(0, 0);
-
-        QCOMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
-                 QStringLiteral(""));
-
-        QDBusInterface accountsIface(m_user->service(),
-                                     m_user->path(),
-                                     "org.freedesktop.Accounts.User");
-        QDBusReply<void> reply = accountsIface.call(QStringLiteral("SetRealName"),
-                                                    QStringLiteral("Test User"));
-        QVERIFY(reply.isValid());
-
-        QTRY_COMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
-                     QStringLiteral("Test User"));
-    }
-
-private:
-    QLightDM::UsersModel *m_model;
-    QDBusInterface *m_accounts;
-    QDBusInterface *m_user;
-};
-
-QTEST_MAIN(GreeterIntegratedTest)
-
-#include "integrated.moc"

=== removed file 'tests/plugins/LightDM/IntegratedLightDM/pam.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/pam.cpp	2016-05-02 18:43:06 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/pam.cpp	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "GreeterPrivate.h"
-
-#include <QtTest>
-
-#include <glib.h>
-
-class GreeterPamTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-
-    void init()
-    {
-        m_greeterpriv = new QLightDM::GreeterPrivate();
-    }
-
-    void cleanup()
-    {
-        delete m_greeterpriv;
-        QTRY_COMPARE(QThreadPool::globalInstance()->activeThreadCount(), 0);
-    }
-
-    void testRapidFireAuthentication()
-    {
-        m_greeterpriv->authenticationUser = QString::fromUtf8(g_get_user_name());
-        for (int i = 0; i < 100; i++) {
-            m_greeterpriv->handleAuthenticate();
-        }
-    }
-
-private:
-    QLightDM::GreeterPrivate *m_greeterpriv;
-};
-
-QTEST_GUILESS_MAIN(GreeterPamTest)
-
-#include "pam.moc"

=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/dbus.cpp' => 'tests/plugins/LightDM/dbus.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/dbus.cpp	2017-01-19 15:37:24 +0000
+++ tests/plugins/LightDM/dbus.cpp	2017-01-26 16:33:43 +0000
@@ -59,7 +59,7 @@
     void init()
     {
         view = new QQuickView();
-        view->setSource(QUrl::fromLocalFile(testDataDir() + "/plugins/LightDM/IntegratedLightDM/greeter.qml"));
+        view->setSource(QUrl::fromLocalFile(testDataDir() + "/plugins/LightDM/greeter.qml"));
         greeter = dynamic_cast<Greeter*>(view->rootObject()->property("greeter").value<QObject*>());
         QVERIFY(greeter);
         QVERIFY(greeter->authenticationUser() == "");

=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/greeter.qml' => 'tests/plugins/LightDM/greeter.qml'
--- tests/plugins/LightDM/IntegratedLightDM/greeter.qml	2016-12-19 19:55:07 +0000
+++ tests/plugins/LightDM/greeter.qml	2017-01-26 16:33:43 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import LightDM.FullLightDM 0.1 as LightDM
+import LightDM 0.1 as LightDM
 
 Item {
     property var greeter: LightDM.Greeter

=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/promptsmodel.cpp' => 'tests/plugins/LightDM/promptsmodel.cpp'
=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp' => 'tests/plugins/LightDM/sessionsmodel.cpp'
=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp' => 'tests/plugins/LightDM/usersmodel.cpp'
=== modified file 'tests/plugins/Unity/Session/sessionbackendtest.cpp'
--- tests/plugins/Unity/Session/sessionbackendtest.cpp	2016-12-19 19:55:07 +0000
+++ tests/plugins/Unity/Session/sessionbackendtest.cpp	2017-01-26 16:33:43 +0000
@@ -62,7 +62,6 @@
         QTest::newRow("Shutdown") << "RequestShutdown" << "ShutdownRequested(bool)";
         QTest::newRow("PromptLock") << "PromptLock" << "LockRequested()";
         QTest::newRow("Lock") << "Lock" << "LockRequested()";
-        QTest::newRow("LockLightDM") << "Lock" << "Locked()"; // happens when we lock LightDM, only for Lock()
     }
 
     void testUnitySessionLogoutRequested() {

=== modified file 'tests/qmltests/Dash/tst_DashShell.qml'
--- tests/qmltests/Dash/tst_DashShell.qml	2017-01-24 07:42:24 +0000
+++ tests/qmltests/Dash/tst_DashShell.qml	2017-01-26 16:33:43 +0000
@@ -20,8 +20,8 @@
 import "../../../qml/"
 import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 
 Item {
     id: root

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2017-01-19 17:52:57 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2017-01-26 16:33:43 +0000
@@ -22,8 +22,8 @@
 import AccountsService 0.1
 import Biometryd 0.0
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 import Unity.Test 0.1 as UT
 
 Item {
@@ -173,7 +173,7 @@
 
         function getIndexOf(name) {
             for (var i = 0; i < LightDM.Users.count; i++) {
-                if (name === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
+                if (name === LightDM.Users.data(i, LightDM.Users.NameRole)) {
                     return i;
                 }
             }
@@ -500,13 +500,13 @@
         function test_selectUserHintUnset() {
             LightDMController.selectUserHint = "";
             resetLoader();
-            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+            verifySelected(LightDM.Users.data(0, LightDM.Users.NameRole));
         }
 
         function test_selectUserHintInvalid() {
             LightDMController.selectUserHint = "not-a-real-user";
             resetLoader();
-            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+            verifySelected(LightDM.Users.data(0, LightDM.Users.NameRole));
         }
 
         function test_selectUserHintGuest() {
@@ -548,7 +548,7 @@
             verify(biometryd.operation);
             verify(biometryd.operation.running);
 
-            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
+            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.Users.UidRole));
             verify(!greeter.active);
         }
 
@@ -560,7 +560,7 @@
             verify(biometryd.operation);
             verify(biometryd.operation.running);
 
-            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
+            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.Users.UidRole));
             compare(viewTryToUnlockSpy.count, 1);
             verify(greeter.locked);
         }
@@ -603,12 +603,12 @@
             compare(viewTryToUnlockSpy.count, 1);
 
             // Confirm that we are stuck in this mode until next login
-            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
+            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.Users.UidRole));
             compare(viewTryToUnlockSpy.count, 2);
 
             unlockAndShowGreeter();
 
-            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
+            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.Users.UidRole));
             verify(!greeter.active);
         }
 

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2016-12-19 19:55:07 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2017-01-26 16:33:43 +0000
@@ -20,7 +20,7 @@
 import "../../../qml/Greeter"
 import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
-import LightDM.FullLightDM 0.1 as LightDM
+import LightDM 0.1 as LightDM
 
 Item {
     property variant infographicModel: LightDM.Infographic

=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
--- tests/qmltests/Greeter/tst_NarrowView.qml	2017-01-19 15:37:24 +0000
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2017-01-26 16:33:43 +0000
@@ -18,8 +18,8 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Test 0.1 as UT
@@ -88,7 +88,7 @@
                 Row {
                     Button {
                         text: "Show Message"
-                        onClicked: LightDMService.prompts.append(messageField.text, LightDMService.prompts.Message)
+                        onClicked: LightDM.Prompts.append(messageField.text, LightDM.Prompts.Message)
                     }
                     TextField {
                         id: messageField
@@ -99,7 +99,7 @@
                 Row {
                     Button {
                         text: "Show Prompt"
-                        onClicked: LightDMService.prompts.append(promptField.text, isSecretCheckBox.checked ? LightDMService.prompts.Secret : LightDMService.prompts.Question)
+                        onClicked: LightDM.Prompts.append(promptField.text, isSecretCheckBox.checked ? LightDM.Prompts.Secret : LightDM.Prompts.Question)
                     }
                     TextField {
                         id: promptField
@@ -269,7 +269,7 @@
             view.currentIndex = 0; // break binding with text field
 
             LightDM.Greeter.authenticate("no-password");
-            tryCompare(LightDMService.prompts, "count", 1);
+            tryCompare(LightDM.Prompts, "count", 1);
 
             telepathyHelper.ready = true;
             telepathyHelper.emergencyCallsAvailable = true;

=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
--- tests/qmltests/Greeter/tst_WideView.qml	2017-01-24 07:40:40 +0000
+++ tests/qmltests/Greeter/tst_WideView.qml	2017-01-26 16:33:43 +0000
@@ -18,8 +18,8 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Greeter"
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Unity.Test 0.1 as UT
 
@@ -119,7 +119,7 @@
                 Row {
                     Button {
                         text: "Show Message"
-                        onClicked: LightDMService.prompts.append(messageField.text, LightDMService.prompts.Message)
+                        onClicked: LightDM.Prompts.append(messageField.text, LightDM.Prompts.Message)
                     }
                     TextField {
                         id: messageField
@@ -130,7 +130,7 @@
                 Row {
                     Button {
                         text: "Show Prompt"
-                        onClicked: LightDMService.prompts.append(promptField.text, isSecretCheckBox.checked ? LightDMService.prompts.Secret : LightDMService.prompts.Question)
+                        onClicked: LightDM.Prompts.append(promptField.text, isSecretCheckBox.checked ? LightDM.Prompts.Secret : LightDM.Prompts.Question)
                     }
                     TextField {
                         id: promptField
@@ -331,7 +331,7 @@
 
         function init() {
             selectIndex(0); // break binding with text field
-            tryCompare(LightDMService.prompts, "count", 1);
+            tryCompare(LightDM.Prompts, "count", 1);
             selectedSpy.clear();
             respondedSpy.clear();
             teaseSpy.clear();
@@ -359,7 +359,7 @@
 
         function getIndexOf(name) {
             for (var i = 0; i < LightDM.Users.count; i++) {
-                if (name === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
+                if (name === LightDM.Users.data(i, LightDM.Users.NameRole)) {
                     return i;
                 }
             }
@@ -368,7 +368,7 @@
         }
 
         function selectIndex(i) {
-            var user = LightDM.Users.data(i, LightDM.UserRoles.NameRole);
+            var user = LightDM.Users.data(i, LightDM.Users.NameRole);
             LightDM.Greeter.authenticate(user);
 
             var userList = findChild(view, "userList");
@@ -449,7 +449,7 @@
             for(var i = 0; i < LightDM.Sessions.count; i++) {
                 var delegateName = "sessionDelegate" + String(i);
                 var currentDelegate = findChild(view, delegateName);
-                var sessionKey = LightDM.Sessions.data(i,LightDM.SessionRoles.KeyRole);
+                var sessionKey = LightDM.Sessions.data(i,LightDM.Sessions.KeyRole);
                 if (sessionKey === "gnome-classic") {
                     waitForRendering(currentDelegate);
                     tap(currentDelegate);

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2016-12-21 18:55:46 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2017-01-26 16:33:43 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.4
 import QtTest 1.0
 import AccountsService 0.1
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3
 import Ubuntu.Telephony 0.1 as Telephony

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2017-01-24 07:43:17 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2017-01-26 16:33:43 +0000
@@ -22,8 +22,8 @@
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Unity.Application 0.1
 import Unity.Test 0.1
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 import Powerd 0.1
 import Unity.InputInfo 0.1
 import Utils 0.1

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-01-24 07:43:54 +0000
+++ tests/qmltests/tst_Shell.qml	2017-01-26 16:33:43 +0000
@@ -18,8 +18,8 @@
 import QtTest 1.0
 import AccountsService 0.1
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 import SessionBroadcast 0.1
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
@@ -450,8 +450,8 @@
                             var biometryd = testCase.findInvisibleChild(shellContainer, "biometryd");
                             var uid = 0;
                             for (var i = 0; i < LightDM.Users.count; i++) {
-                                if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == AccountsService.user) {
-                                    uid = LightDM.Users.data(i, LightDM.UserRoles.UidRole);
+                                if (LightDM.Users.data(i, LightDM.Users.NameRole) == AccountsService.user) {
+                                    uid = LightDM.Users.data(i, LightDM.Users.UidRole);
                                     break;
                                 }
                             }
@@ -832,7 +832,7 @@
         function selectUser(name) {
             // Find index of user with the right name
             for (var i = 0; i < LightDM.Users.count; i++) {
-                if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == name) {
+                if (LightDM.Users.data(i, LightDM.Users.NameRole) == name) {
                     break
                 }
             }

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2017-01-24 07:42:24 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2017-01-26 16:33:43 +0000
@@ -19,8 +19,8 @@
 import QtTest 1.0
 import AccountsService 0.1
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import LightDMController 0.1
-import LightDM.FullLightDM 0.1 as LightDM
 import Ubuntu.SystemImage 0.1
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Application 0.1