Merge lp:~alan-griffiths/mir/fix-Surface-hierarchy-make-SessionContainer-private into lp:mir

[Alan Griffiths]

shell: don't publish SurfacesContainer - it can be private to shell.

shell: don't publish SurfacesContainer - it can be private to shell.

This MP disentangles SurfacesContainer from frontend, and makes it private to shell.

It and much of the code that uses it (default_session_container.cpp, global_event_sender.cpp, mediating_display_changer.cpp and session_manager.cpp) probably belong in surfaces. But that is for a future date.

NB this currently breaks unity-system-compositor, but that will be sorted long before this hits lp:mir.

[Kevin DuBois (kdub)]

overall looks okay. I agree with "It and much of the code that uses it (default_session_container.cpp, global_event_sender.cpp, mediating_display_changer.cpp and session_manager.cpp) probably belong in surfaces. "

the_for_all_sessions_force_requests_to_complete_functor is a funny name... the_force_all_requests_to_complete_functor() was the only name I could come up with....

[Alan Griffiths (alan-griffiths)]

> the_for_all_sessions_force_requests_to_complete_functor is a funny name...
> the_force_all_requests_to_complete_functor() was the only name I could come up
> with....

It is a funny name for a funny abstraction. It is hard to see why the Connector should have responsibility for calling into the data model like this. In practice, the connector owns the threads that must be joined (and therefore first unblocked) and I can't immediately think of a better approach.

For example: Keeping thing within "frontend" the SessionCreator tracks SocketSessions and these own MessageProcessors (implemented as ProtobufMessageProcessor) and these own a DisplayServer (implemented as SessionMediator) and that has a Session which has surfaces... So we could add corresponding "unblock" calls through this stack instead and avoid this strange functor. But that, I feel is a story for another MP.

[Alexandros Frantzis (afrantzis)]

Looks good.

> the_for_all_sessions_force_requests_to_complete_functor is a funny name...
> the_force_all_requests_to_complete_functor() was the only name I could come up with....

I think the_force_all_requests_to_complete_functor() or the_force_all_(client|session)_requests_to_complete_functor()
are a bit more straightforward, but not a blocker.

review: Approve

[Alan Griffiths (alan-griffiths)]

> Looks good.
>
> > the_for_all_sessions_force_requests_to_complete_functor is a funny name...
> > the_force_all_requests_to_complete_functor() was the only name I could come
> up with....
>
> I think the_force_all_requests_to_complete_functor() or
> the_force_all_(client|session)_requests_to_complete_functor()
> are a bit more straightforward, but not a blocker.

I'm willing to be outvoted but I don't think these names are improvements:

1. These suggestions breaks up the "force_requests_to_complete" name of the function to be called for each session..

2. "the_force_all_requests_to_complete_functor()" as part of the system configuration lacks context. I think that is supplied by "for_all_sessions".

[Daniel van Vugt (vanvugt)]

I like the idea. But I think there comes a point where wordiness is a significant hurdle to readability:

129 + auto const& force_requests_to_complete = the_for_all_sessions_force_requests_to_complete_functor();

189 +mir::DefaultServerConfiguration::the_for_all_sessions_force_requests_to_complete_functor()

Remember people see and read words as singular symbols, not looking at individual letters. If the symbol is too complex to recognize without looking at individual letters, then it's not really readable.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

In the context of programming, it's the entire identifier (all words together) that needs to be recognizable as a single symbol. Not just the individual words within it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/370/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/99/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/370/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Yep, better thanks.

I find it strange to be returning a function from a function, and suspect a better design is possible. But won't pause to try and redesign existing semantics.

review: Approve

=== modified file 'examples/demo-shell/demo_shell.cpp'
--- examples/demo-shell/demo_shell.cpp	2013-11-04 05:59:29 +0000
+++ examples/demo-shell/demo_shell.cpp	2013-11-15 09:55:09 +0000
@@ -24,7 +24,6 @@
 
 #include "mir/run_mir.h"
 #include "mir/report_exception.h"
-#include "mir/shell/session_container.h"
 #include "mir/graphics/display.h"
 #include "mir/input/composite_event_filter.h"
 
 
=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-11-12 11:07:59 +0000
+++ include/server/mir/default_server_configuration.h	2013-11-15 09:55:09 +0000
@@ -312,6 +312,7 @@
     std::shared_ptr<input::NestedInputRelay>        the_nested_input_relay();
     std::shared_ptr<surfaces::SurfaceBuilder>       the_surface_builder();
     std::shared_ptr<surfaces::SurfaceController>    the_surface_controller();
+    std::function<void()> force_threads_to_unblock_callback();
 };
 }
 
 
=== modified file 'include/server/mir/frontend/shell.h'
--- include/server/mir/frontend/shell.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/frontend/shell.h	2013-11-15 09:55:09 +0000
@@ -36,7 +36,7 @@
 class Shell
 {
 public:
-    virtual ~Shell() {}
+    virtual ~Shell() = default;
 
     virtual std::shared_ptr<Session> open_session(
         std::string const& name, std::shared_ptr<EventSink> const& sink) = 0;
@@ -44,7 +44,7 @@
 
     virtual SurfaceId create_surface_for(std::shared_ptr<Session> const& session,
                                          shell::SurfaceCreationParameters const& params) = 0;
-    
+
     virtual void handle_surface_created(std::shared_ptr<Session> const& session) = 0;
 
 protected:
 
=== modified file 'include/server/mir/shell/session_manager.h'
--- include/server/mir/shell/session_manager.h	2013-11-07 23:20:58 +0000
+++ include/server/mir/shell/session_manager.h	2013-11-15 09:55:09 +0000
@@ -29,23 +29,15 @@
 
 namespace mir
 {
-
-namespace frontend
-{
-class EventSink;
-}
 /// Management of sessions and surfaces
 namespace shell
 {
 class SurfaceFactory;
 class SessionContainer;
 class FocusSetter;
-class Session;
-class InputRegistrar;
 class SnapshotStrategy;
 class SessionEventSink;
 class SessionListener;
-struct SurfaceCreationParameters;
 
 // TODO make private to shell
 // This first needs unity-mir to be updated to use FocusController
@@ -71,7 +63,7 @@
     void focus_next();
     std::weak_ptr<Session> focussed_application() const;
     void set_focus_to(std::shared_ptr<Session> const& focus);
-    
+
     void handle_surface_created(std::shared_ptr<frontend::Session> const& session);
 
 protected:
 
=== modified file 'src/server/frontend/CMakeLists.txt'
--- src/server/frontend/CMakeLists.txt	2013-11-04 05:59:29 +0000
+++ src/server/frontend/CMakeLists.txt	2013-11-15 09:55:09 +0000
@@ -8,7 +8,6 @@
   protobuf_message_processor.cpp
   protobuf_buffer_packer.cpp
   null_message_processor.cpp
-  global_event_sender.cpp
   published_socket_connector.cpp
   protobuf_session_creator.cpp
   socket_session.cpp
 
=== modified file 'src/server/frontend/default_configuration.cpp'
--- src/server/frontend/default_configuration.cpp	2013-11-04 05:59:29 +0000
+++ src/server/frontend/default_configuration.cpp	2013-11-15 09:55:09 +0000
@@ -19,7 +19,6 @@
 #include "mir/default_server_configuration.h"
 
 #include "resource_cache.h"
-#include "global_event_sender.h"
 #include "protobuf_ipc_factory.h"
 #include "protobuf_session_creator.h"
 #include "published_socket_connector.h"
@@ -27,8 +26,6 @@
 #include "unauthorized_display_changer.h"
 
 #include "mir/options/option.h"
-#include "mir/shell/session_container.h"
-#include "mir/shell/session.h"
 
 namespace mf = mir::frontend;
 namespace mg = mir::graphics;
@@ -121,21 +118,15 @@
         {
             auto const threads = the_options()->get(frontend_threads,
                                                     default_ipc_threads);
-            auto shell_sessions = the_shell_session_container();
-            auto const& force_requests_to_complete = [shell_sessions]
-            {
-                shell_sessions->for_each([](std::shared_ptr<msh::Session> const& session)
-                {
-                    session->force_requests_to_complete();
-                });
-            };
+
+            auto const& force_threads_to_unblock = force_threads_to_unblock_callback();
 
             if (the_options()->is_set(no_server_socket_opt))
             {
                 return std::make_shared<mf::BasicConnector>(
                     the_session_creator(),
                     threads,
-                    force_requests_to_complete,
+                    force_threads_to_unblock,
                     the_connector_report());
             }
             else
@@ -144,22 +135,12 @@
                     the_socket_file(),
                     the_session_creator(),
                     threads,
-                    force_requests_to_complete,
+                    force_threads_to_unblock,
                     the_connector_report());
             }
         });
 }
 
-std::shared_ptr<mf::EventSink>
-mir::DefaultServerConfiguration::the_global_event_sink()
-{
-    return global_event_sink(
-        [this]()
-        {
-            return std::make_shared<mf::GlobalEventSender>(the_shell_session_container());
-        });
-}
-
 std::shared_ptr<mir::frontend::ProtobufIpcFactory>
 mir::DefaultServerConfiguration::the_ipc_factory(
     std::shared_ptr<mf::Shell> const& shell,
 
=== modified file 'src/server/frontend/published_socket_connector.cpp'
--- src/server/frontend/published_socket_connector.cpp	2013-10-15 08:53:10 +0000
+++ src/server/frontend/published_socket_connector.cpp	2013-11-15 09:55:09 +0000
@@ -35,9 +35,9 @@
     const std::string& socket_file,
     std::shared_ptr<SessionCreator> const& session_creator,
     int threads,
-    std::function<void()> const& force_requests_to_complete,
+    std::function<void()> const& force_threads_to_unblock,
     std::shared_ptr<ConnectorReport> const& report)
-:   BasicConnector(session_creator, threads, force_requests_to_complete, report),
+:   BasicConnector(session_creator, threads, force_threads_to_unblock, report),
     socket_file(socket_file),
     acceptor(io_service, socket_file)
 {
@@ -83,11 +83,11 @@
 mf::BasicConnector::BasicConnector(
     std::shared_ptr<SessionCreator> const& session_creator,
     int threads,
-    std::function<void()> const& force_requests_to_complete,
+    std::function<void()> const& force_threads_to_unblock,
     std::shared_ptr<ConnectorReport> const& report)
 :   report(report),
     io_service_threads(threads),
-    force_requests_to_complete(force_requests_to_complete),
+    force_threads_to_unblock(force_threads_to_unblock),
     session_creator{session_creator}
 {
 }
@@ -126,7 +126,7 @@
      * Ensure that any pending requests will complete (i.e., that they
      * will not block indefinitely waiting for a resource from the server)
      */
-    force_requests_to_complete();
+    force_threads_to_unblock();
 
     report->stopping_threads(io_service_threads.size());
 
 
=== modified file 'src/server/frontend/published_socket_connector.h'
--- src/server/frontend/published_socket_connector.h	2013-10-15 08:53:10 +0000
+++ src/server/frontend/published_socket_connector.h	2013-11-15 09:55:09 +0000
@@ -50,7 +50,7 @@
     explicit BasicConnector(
         std::shared_ptr<SessionCreator> const& session_creator,
         int threads,
-        std::function<void()> const& force_requests_to_complete,
+        std::function<void()> const& force_threads_to_unblock,
         std::shared_ptr<ConnectorReport> const& report);
     ~BasicConnector() noexcept;
     void start() override;
@@ -66,7 +66,7 @@
 
 private:
     std::vector<std::thread> io_service_threads;
-    std::function<void()> const force_requests_to_complete;
+    std::function<void()> const force_threads_to_unblock;
     std::shared_ptr<SessionCreator> const session_creator;
 };
 
@@ -78,7 +78,7 @@
         const std::string& socket_file,
         std::shared_ptr<SessionCreator> const& session_creator,
         int threads,
-        std::function<void()> const& force_requests_to_complete,
+        std::function<void()> const& force_threads_to_unblock,
         std::shared_ptr<ConnectorReport> const& report);
     ~PublishedSocketConnector() noexcept;
 
 
=== modified file 'src/server/shell/CMakeLists.txt'
--- src/server/shell/CMakeLists.txt	2013-11-08 18:56:58 +0000
+++ src/server/shell/CMakeLists.txt	2013-11-15 09:55:09 +0000
@@ -10,6 +10,7 @@
   surface_creation_parameters.cpp
   threaded_snapshot_strategy.cpp
   gl_pixel_buffer.cpp
+  global_event_sender.cpp
   graphics_display_layout.cpp
   mediating_display_changer.cpp
   broadcasting_session_event_sink.cpp
 
=== modified file 'src/server/shell/default_configuration.cpp'
--- src/server/shell/default_configuration.cpp	2013-11-08 19:03:12 +0000
+++ src/server/shell/default_configuration.cpp	2013-11-15 09:55:09 +0000
@@ -23,11 +23,15 @@
 #include "default_focus_mechanism.h"
 #include "default_session_container.h"
 #include "gl_pixel_buffer.h"
+#include "global_event_sender.h"
 #include "graphics_display_layout.h"
 #include "mediating_display_changer.h"
 #include "organising_surface_factory.h"
+#include "threaded_snapshot_strategy.h"
+
+#include "session_container.h"
 #include "mir/shell/session_manager.h"
-#include "threaded_snapshot_strategy.h"
+#include "mir/shell/session.h"
 
 #include "mir/graphics/display.h"
 #include "mir/graphics/gl_context.h"
@@ -187,3 +191,26 @@
                 the_shell_pixel_buffer());
         });
 }
+
+std::function<void()>
+mir::DefaultServerConfiguration::force_threads_to_unblock_callback()
+{
+    auto shell_sessions = the_shell_session_container();
+    return [shell_sessions]
+    {
+        shell_sessions->for_each([](std::shared_ptr<msh::Session> const& session)
+        {
+            session->force_requests_to_complete();
+        });
+    };
+}
+
+std::shared_ptr<mf::EventSink>
+mir::DefaultServerConfiguration::the_global_event_sink()
+{
+    return global_event_sink(
+        [this]()
+        {
+            return std::make_shared<msh::GlobalEventSender>(the_shell_session_container());
+        });
+}
 
=== modified file 'src/server/shell/default_session_container.cpp'
--- src/server/shell/default_session_container.cpp	2013-11-07 23:20:58 +0000
+++ src/server/shell/default_session_container.cpp	2013-11-15 09:55:09 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "default_session_container.h"
-#include "mir/shell/session.h"
 
 #include <boost/throw_exception.hpp>
 
 
=== modified file 'src/server/shell/default_session_container.h'
--- src/server/shell/default_session_container.h	2013-11-07 23:20:58 +0000
+++ src/server/shell/default_session_container.h	2013-11-15 09:55:09 +0000
@@ -23,7 +23,7 @@
 #include <memory>
 #include <mutex>
 
-#include "mir/shell/session_container.h"
+#include "session_container.h"
 
 namespace mir
 {
 
=== renamed file 'src/server/frontend/global_event_sender.cpp' => 'src/server/shell/global_event_sender.cpp'
--- src/server/frontend/global_event_sender.cpp	2013-10-24 14:33:46 +0000
+++ src/server/shell/global_event_sender.cpp	2013-11-15 09:55:09 +0000
@@ -17,29 +17,28 @@
  */
 
 #include "global_event_sender.h"
-#include "mir/shell/session_container.h"
+#include "session_container.h"
 #include "mir/shell/session.h"
 
-namespace mf=mir::frontend;
 namespace mg=mir::graphics;
 namespace msh=mir::shell;
 
-mf::GlobalEventSender::GlobalEventSender(std::shared_ptr<shell::SessionContainer> const& session_container)
+msh::GlobalEventSender::GlobalEventSender(std::shared_ptr<SessionContainer> const& session_container)
     : sessions(session_container)
 {
 }
 
-void mf::GlobalEventSender::handle_event(MirEvent const&)
+void msh::GlobalEventSender::handle_event(MirEvent const&)
 { 
     //TODO, no driving test cases, although messages like 'server shutdown' could go here
 }
 
-void mf::GlobalEventSender::handle_lifecycle_event(MirLifecycleState)
+void msh::GlobalEventSender::handle_lifecycle_event(MirLifecycleState)
 {
     // Lifecycle events are per application session, never global
 }
 
-void mf::GlobalEventSender::handle_display_config_change(mg::DisplayConfiguration const& config)
+void msh::GlobalEventSender::handle_display_config_change(mg::DisplayConfiguration const& config)
 {
     sessions->for_each([&config](std::shared_ptr<msh::Session> const& session)
     {
 
=== renamed file 'src/server/frontend/global_event_sender.h' => 'src/server/shell/global_event_sender.h'
--- src/server/frontend/global_event_sender.h	2013-10-24 14:33:46 +0000
+++ src/server/shell/global_event_sender.h	2013-11-15 09:55:09 +0000
@@ -16,8 +16,8 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#ifndef MIR_FRONTEND_GLOBAL_EVENT_SENDER_H_
-#define MIR_FRONTEND_GLOBAL_EVENT_SENDER_H_
+#ifndef MIR_SHELL_GLOBAL_EVENT_SENDER_H_
+#define MIR_SHELL_GLOBAL_EVENT_SENDER_H_
 
 #include "mir/frontend/event_sink.h"
 #include <memory>
@@ -27,22 +27,20 @@
 namespace shell
 {
 class SessionContainer;
-}
-namespace frontend
-{
-class GlobalEventSender : public EventSink
+
+class GlobalEventSender : public frontend::EventSink
 {
 public:
-    GlobalEventSender(std::shared_ptr<shell::SessionContainer> const&);
+    GlobalEventSender(std::shared_ptr<SessionContainer> const&);
 
     void handle_event(MirEvent const& e);
     void handle_lifecycle_event(MirLifecycleState state);
     void handle_display_config_change(graphics::DisplayConfiguration const& config);
 
 private:
-    std::shared_ptr<shell::SessionContainer> const sessions;
+    std::shared_ptr<SessionContainer> const sessions;
 };
 }
 }
 
-#endif /* MIR_FRONTEND_GLOBAL_EVENT_SENDER_H_ */
+#endif /* MIR_SHELL_GLOBAL_EVENT_SENDER_H_ */
 
=== modified file 'src/server/shell/mediating_display_changer.cpp'
--- src/server/shell/mediating_display_changer.cpp	2013-11-04 05:59:29 +0000
+++ src/server/shell/mediating_display_changer.cpp	2013-11-15 09:55:09 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mediating_display_changer.h"
-#include "mir/shell/session_container.h"
+#include "session_container.h"
 #include "mir/shell/session.h"
 #include "session_event_handler_register.h"
 #include "mir/graphics/display.h"
 
=== renamed file 'include/server/mir/shell/session_container.h' => 'src/server/shell/session_container.h'
=== modified file 'src/server/shell/session_manager.cpp'
--- src/server/shell/session_manager.cpp	2013-11-14 13:42:28 +0000
+++ src/server/shell/session_manager.cpp	2013-11-15 09:55:09 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/shell/session_manager.h"
 #include "mir/shell/application_session.h"
-#include "mir/shell/session_container.h"
+#include "session_container.h"
 #include "mir/shell/surface_factory.h"
 #include "mir/shell/focus_setter.h"
 #include "mir/shell/session.h"
 
=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2013-11-11 17:07:09 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2013-11-15 09:55:09 +0000
@@ -21,7 +21,7 @@
 #include "mir/shell/placement_strategy.h"
 #include "mir/shell/surface_factory.h"
 #include "mir/shell/surface.h"
-#include "mir/shell/session_container.h"
+#include "src/server/shell/session_container.h"
 #include "mir/shell/session.h"
 #include "src/server/surfaces/surface_controller.h"
 #include "src/server/surfaces/surface_stack_model.h"
 
=== modified file 'tests/acceptance-tests/test_display_configuration.cpp'
--- tests/acceptance-tests/test_display_configuration.cpp	2013-11-04 13:39:27 +0000
+++ tests/acceptance-tests/test_display_configuration.cpp	2013-11-15 09:55:09 +0000
@@ -19,7 +19,7 @@
 
 #include "mir/frontend/session_authorizer.h"
 #include "mir/graphics/event_handler_register.h"
-#include "src/server/frontend/global_event_sender.h"
+#include "src/server/shell/global_event_sender.h"
 
 #include "mir_test_framework/display_server_test_fixture.h"
 #include "mir_test_framework/cross_process_sync.h"
 
=== modified file 'tests/acceptance-tests/test_focus_selection.cpp'
--- tests/acceptance-tests/test_focus_selection.cpp	2013-11-12 02:30:22 +0000
+++ tests/acceptance-tests/test_focus_selection.cpp	2013-11-15 09:55:09 +0000
@@ -18,7 +18,7 @@
 
 #include "mir_toolkit/mir_client_library.h"
 
-#include "mir/shell/session_container.h"
+#include "src/server/shell/session_container.h"
 #include "src/server/shell/consuming_placement_strategy.h"
 #include "src/server/shell/organising_surface_factory.h"
 #include "mir/shell/session_manager.h"
 
=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2013-11-04 13:58:32 +0000
+++ tests/integration-tests/test_display_info.cpp	2013-11-15 09:55:09 +0000
@@ -22,7 +22,6 @@
 #include "src/server/frontend/protobuf_ipc_factory.h"
 #include "src/server/frontend/resource_cache.h"
 #include "src/server/frontend/session_mediator.h"
-#include "src/server/frontend/global_event_sender.h"
 
 #include "mir_test_framework/display_server_test_fixture.h"
 #include "mir_test_framework/cross_process_sync.h"
 
=== modified file 'tests/unit-tests/frontend/CMakeLists.txt'
--- tests/unit-tests/frontend/CMakeLists.txt	2013-11-04 05:59:29 +0000
+++ tests/unit-tests/frontend/CMakeLists.txt	2013-11-15 09:55:09 +0000
@@ -9,7 +9,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_session_mediator.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_socket_session.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_event_sender.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_global_event_sender.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_unauthorized_display_changer.cpp
 )
 
 
=== modified file 'tests/unit-tests/shell/CMakeLists.txt'
--- tests/unit-tests/shell/CMakeLists.txt	2013-11-08 18:56:58 +0000
+++ tests/unit-tests/shell/CMakeLists.txt	2013-11-15 09:55:09 +0000
@@ -7,6 +7,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_organising_surface_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_threaded_snapshot_strategy.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_gl_pixel_buffer.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_global_event_sender.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_graphics_display_layout.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_broadcasting_session_event_sink.cpp
 )
 
=== renamed file 'tests/unit-tests/frontend/test_global_event_sender.cpp' => 'tests/unit-tests/shell/test_global_event_sender.cpp'
--- tests/unit-tests/frontend/test_global_event_sender.cpp	2013-11-07 23:20:58 +0000
+++ tests/unit-tests/shell/test_global_event_sender.cpp	2013-11-15 09:55:09 +0000
@@ -16,8 +16,8 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/server/frontend/global_event_sender.h"
-#include "mir/shell/session_container.h"
+#include "src/server/shell/global_event_sender.h"
+#include "src/server/shell/session_container.h"
 #include "mir_test_doubles/mock_frontend_surface.h"
 #include "mir_test_doubles/mock_shell_session.h"
 #include "mir_test_doubles/stub_display_configuration.h"
@@ -29,7 +29,6 @@
 namespace mt=mir::test;
 namespace mtd=mir::test::doubles;
 namespace msh=mir::shell;
-namespace mf=mir::frontend;
 
 namespace
 {
@@ -55,7 +54,7 @@
         .Times(1)
         .WillOnce(SaveArg<0>(&called_fn)); 
 
-    mf::GlobalEventSender g_sender(mt::fake_shared(mock_storage));
+    msh::GlobalEventSender g_sender(mt::fake_shared(mock_storage));
 
     mtd::StubDisplayConfig stub_display_config;
     g_sender.handle_display_config_change(stub_display_config);
 
=== modified file 'tests/unit-tests/shell/test_mediating_display_changer.cpp'
--- tests/unit-tests/shell/test_mediating_display_changer.cpp	2013-11-04 05:59:29 +0000
+++ tests/unit-tests/shell/test_mediating_display_changer.cpp	2013-11-15 09:55:09 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "src/server/shell/mediating_display_changer.h"
-#include "mir/shell/session_container.h"
+#include "src/server/shell/session_container.h"
 #include "mir/graphics/display_configuration_policy.h"
 #include "src/server/shell/broadcasting_session_event_sink.h"