Mir

Merge lp:~alan-griffiths/mir/request-with-authority into lp:mir

request-with-authority
Merge into development-branch

Proposed by Alan Griffiths on 2017-03-23

Status:	Merged
Approved by:	Alan Griffiths on 2017-03-28
Approved revision:	4111
Merged at revision:	4122
Proposed branch:	lp:~alan-griffiths/mir/request-with-authority
Merge into:	lp:mir
Diff against target:	530 lines (+111/-157) 12 files modified src/client/mir_surface.cpp (+16/-22) src/client/mir_surface.h (+1/-1) src/client/rpc/mir_display_server.cpp (+2/-10) src/client/rpc/mir_display_server.h (+2/-6) src/include/common/mir/protobuf/display_server.h (+2/-6) src/protobuf/mir_protobuf.proto (+7/-5) src/protobuf/symbols.map (+21/-20) src/server/frontend/protobuf_message_processor.cpp (+2/-6) src/server/frontend/session_mediator.cpp (+16/-25) src/server/frontend/session_mediator.h (+2/-6) tests/include/mir/test/doubles/stub_display_server.h (+36/-48) tests/unit-tests/frontend/test_session_mediator.cpp (+4/-2)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/request-with-authority
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andreas Pokorny (community)		2017-03-23	Approve on 2017-03-27
Mir CI Bot	continuous-integration		Approve on 2017-03-24
Review via email: mp+320825@code.launchpad.net

Commit Message

Refactor RPC to provide a more generic approach to window management requests that need authorization.

Description of the Change

Refactor RPC to provide a more generic approach to window management requests that need authorization.

My intention is to support new APIs using this RPC. Vis:

void mir_window_request_user_move(MirWindow* window, MirCookie const* cookie);
void mir_window_request_user_resize(MirWindow* window, MirCookie const* cookie);

lp:~alan-griffiths/mir/request-with-authority updated on 2017-03-23

4109. By Alan Griffiths on 2017-03-23: DRY
4110. By Alan Griffiths on 2017-03-23: Pass enum by value

Mir CI Bot (mir-ci-bot) wrote on 2017-03-23:

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

review: Approve (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-03-23:

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

review: Approve (continuous-integration)

lp:~alan-griffiths/mir/request-with-authority updated on 2017-03-24

4111. By Alan Griffiths on 2017-03-24: merge :parent

Mir CI Bot (mir-ci-bot) wrote on 2017-03-24:

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

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2017-03-24:

bug 1658057

Mir CI Bot (mir-ci-bot) wrote on 2017-03-24:

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

review: Approve (continuous-integration)

Andreas Pokorny (andreas-pokorny) wrote on 2017-03-24:

I assume you plan to track MirCookie -> down-move-up gestures in mirserver - so stating the MirCookie is sufficient to identify the specific touch contact on the touchscreen or the specific pointing device, that when successfully matched will be tracked for motion?

lgtm otherwise

review: Needs Information

Alan Griffiths (alan-griffiths) wrote on 2017-03-27:

> I assume you plan to track MirCookie -> down-move-up gestures in mirserver -
> so stating the MirCookie is sufficient to identify the specific touch contact
> on the touchscreen or the specific pointing device, that when successfully
> matched will be tracked for motion?

Agreed, the window management policy needs the event to correctly interpret the request.

I didn't fancy introducing a transport mechanism to forward input events from the client to the server. Tracking the latest event (like the existing tracking of its timestamp) on the server seems far simpler.

Andreas Pokorny (andreas-pokorny) wrote on 2017-03-27:

> > I assume you plan to track MirCookie -> down-move-up gestures in mirserver -
> > so stating the MirCookie is sufficient to identify the specific touch
> contact
> > on the touchscreen or the specific pointing device, that when successfully
> > matched will be tracked for motion?
>
> Agreed, the window management policy needs the event to correctly interpret
> the request.
>
> I didn't fancy introducing a transport mechanism to forward input events from
> the client to the server. Tracking the latest event (like the existing
> tracking of its timestamp) on the server seems far simpler.

yes...

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'src/client/mir_surface.cpp'
 --- src/client/mir_surface.cpp	2017-03-23 17:23:58 +0000
 +++ src/client/mir_surface.cpp	2017-03-24 10:59:54 +0000
@@ -585,34 +585,28 @@
  void MirSurface::raise_surface(MirCookie const* cookie)
+ {
--    mp::RaiseRequest raise_request;
--
--    std::unique_lock<decltype(mutex)> lock(mutex);
--    raise_request.mutable_surface_id()->set_value(surface->id().value());
--
--    auto const event_cookie = raise_request.mutable_cookie();
--
--    event_cookie->set_cookie(cookie->cookie().data(), cookie->size());
--
--    server->raise_surface(
--        &raise_request,
--        void_response.get(),
--        google::protobuf::NewCallback(google::protobuf::DoNothing));
++    request_operation(cookie, mp::RequestOperation::MAKE_ACTIVE);
+ }
  void MirSurface::request_drag_and_drop(MirCookie const* cookie)
+ {
--    mp::RequestAuthority authority;
++    request_operation(cookie, mp::RequestOperation::START_DRAG_AND_DROP);
++}
++
++void MirSurface::request_operation(MirCookie const* cookie, mir::protobuf::RequestOperation operation) const
++{
++    mir::protobuf::RequestWithAuthority request;
++    request.set_operation(operation);
      std::unique_lock<decltype(mutex)> lock(mutex);
--    authority.mutable_surface_id()->set_value(surface->id().value());
--
--    auto const event_cookie = authority.mutable_cookie();
--
--    event_cookie->set_cookie(cookie->cookie().data(), cookie->size());
--
--    server->request_drag_and_drop(
--        &authority,
++    request.mutable_surface_id()->set_value(surface->id().value());
++
++    auto const event_authority = request.mutable_authority();
++
++    event_authority->set_cookie(cookie->cookie().data(), cookie->size());
++
++    server->request_operation(
++        &request,
          void_response.get(),
          google::protobuf::NewCallback(google::protobuf::DoNothing));
+ }
 === modified file 'src/client/mir_surface.h'
 --- src/client/mir_surface.h	2017-03-23 17:23:58 +0000
 +++ src/client/mir_surface.h	2017-03-24 10:59:54 +0000
@@ -229,6 +229,7 @@
      void on_configured();
      void on_cursor_configured();
      void acquired_persistent_id(MirWindowIdCallback callback, void* context);
++    void request_operation(MirCookie const* cookie, mir::protobuf::RequestOperation operation) const;
      mir::client::rpc::DisplayServer* const server{nullptr};
      mir::client::rpc::DisplayServerDebug* const debug{nullptr};
@@ -274,7 +275,6 @@
      MirPixelFormat format;
      MirBufferUsage usage;
      uint32_t output_id;
--
  };
  #pragma GCC diagnostic pop
 === modified file 'src/client/rpc/mir_display_server.cpp'
 --- src/client/rpc/mir_display_server.cpp	2017-03-08 12:13:23 +0000
 +++ src/client/rpc/mir_display_server.cpp	2017-03-24 10:59:54 +0000
@@ -231,16 +231,8 @@
+ {
      channel->call_method(std::string(__func__), request, response, done);
+ }
--void mclr::DisplayServer::raise_surface(
--    mir::protobuf::RaiseRequest const* request,
--    mir::protobuf::Void* response,
--    google::protobuf::Closure* done)
--{
--    channel->call_method(std::string(__func__), request, response, done);
--}
--
--void mclr::DisplayServer::request_drag_and_drop(
--    mir::protobuf::RequestAuthority const* request,
++void mclr::DisplayServer::request_operation(
++    mir::protobuf::RequestWithAuthority const* request,
      mir::protobuf::Void* response,
      google::protobuf::Closure* done)
+ {
 === modified file 'src/client/rpc/mir_display_server.h'
 --- src/client/rpc/mir_display_server.h	2017-03-08 12:13:23 +0000
 +++ src/client/rpc/mir_display_server.h	2017-03-24 10:59:54 +0000
@@ -151,12 +151,8 @@
          mir::protobuf::StreamConfiguration const* request,
          mir::protobuf::Void* response,
          google::protobuf::Closure* done) override;
--    void raise_surface(
--        mir::protobuf::RaiseRequest const* request,
--        mir::protobuf::Void* response,
--        google::protobuf::Closure* done) override;
--    void request_drag_and_drop(
--        mir::protobuf::RequestAuthority const* request,
++    void request_operation(
++        mir::protobuf::RequestWithAuthority const* request,
          mir::protobuf::Void* response,
          google::protobuf::Closure* done) override;
      void apply_input_configuration(
 === modified file 'src/include/common/mir/protobuf/display_server.h'
 --- src/include/common/mir/protobuf/display_server.h	2017-03-08 12:13:23 +0000
 +++ src/include/common/mir/protobuf/display_server.h	2017-03-24 10:59:54 +0000
@@ -147,12 +147,8 @@
          mir::protobuf::StreamConfiguration const* request,
          mir::protobuf::Void* response,
          google::protobuf::Closure* done) = 0;
--    virtual void raise_surface(
--        mir::protobuf::RaiseRequest const* request,
--        mir::protobuf::Void* response,
--        google::protobuf::Closure* done) = 0;
--    virtual void request_drag_and_drop(
--        mir::protobuf::RequestAuthority const* request,
++    virtual void request_operation(
++        mir::protobuf::RequestWithAuthority const* request,
          mir::protobuf::Void* response,
          google::protobuf::Closure* done) = 0;
      virtual void apply_input_configuration(
 === modified file 'src/protobuf/mir_protobuf.proto'
 --- src/protobuf/mir_protobuf.proto	2017-03-15 09:30:18 +0000
 +++ src/protobuf/mir_protobuf.proto	2017-03-24 10:59:54 +0000
@@ -439,14 +439,16 @@
    required bytes cookie = 1;
+ }
--message RaiseRequest {
--  required Cookie cookie = 1;
--  required SurfaceId surface_id = 2;
++enum RequestOperation {
++  UNKNOWN = 0;
++  START_DRAG_AND_DROP = 1;
++  MAKE_ACTIVE = 2;
+ }
--message RequestAuthority {
--  required Cookie cookie = 1;
++message RequestWithAuthority {
++  required Cookie authority = 1;
    required SurfaceId surface_id = 2;
++  required RequestOperation operation = 3;
+ }
  message InputDevices {
 === modified file 'src/protobuf/symbols.map'
 --- src/protobuf/symbols.map	2017-03-08 12:13:23 +0000
 +++ src/protobuf/symbols.map	2017-03-24 10:59:54 +0000
@@ -1116,25 +1116,26 @@
  MIR_PROTOBUF_0.27 {
   global:
    extern "C++" {
--    mir::protobuf::RequestAuthority::ByteSize*;
--    mir::protobuf::RequestAuthority::CheckTypeAndMergeFrom*;
--    mir::protobuf::RequestAuthority::Clear*;
--    mir::protobuf::RequestAuthority::CopyFrom*;
--    mir::protobuf::RequestAuthority::default_instance*;
--    mir::protobuf::RequestAuthority::DiscardUnknownFields*;
--    mir::protobuf::RequestAuthority::GetTypeName*;
--    mir::protobuf::RequestAuthority::IsInitialized*;
--    mir::protobuf::RequestAuthority::kCookieFieldNumber*;
--    mir::protobuf::RequestAuthority::kSurfaceIdFieldNumber*;
--    mir::protobuf::RequestAuthority::MergeFrom*;
--    mir::protobuf::RequestAuthority::MergePartialFromCodedStream*;
--    mir::protobuf::RequestAuthority::New*;
--    mir::protobuf::RequestAuthority::?RequestAuthority*;
--    mir::protobuf::RequestAuthority::RequestAuthority*;
--    mir::protobuf::RequestAuthority::SerializeWithCachedSizes*;
--    mir::protobuf::RequestAuthority::Swap*;
--    non-virtual?thunk?to?mir::protobuf::RequestAuthority::?RequestAuthority*;
--    typeinfo?for?mir::protobuf::RequestAuthority;
--    vtable?for?mir::protobuf::RequestAuthority;
++    mir::protobuf::RequestOperation_IsValid*;
++    mir::protobuf::RequestWithAuthority::ByteSize*;
++    mir::protobuf::RequestWithAuthority::CheckTypeAndMergeFrom*;
++    mir::protobuf::RequestWithAuthority::Clear*;
++    mir::protobuf::RequestWithAuthority::CopyFrom*;
++    mir::protobuf::RequestWithAuthority::default_instance*;
++    mir::protobuf::RequestWithAuthority::DiscardUnknownFields*;
++    mir::protobuf::RequestWithAuthority::GetTypeName*;
++    mir::protobuf::RequestWithAuthority::IsInitialized*;
++    mir::protobuf::RequestWithAuthority::kCookieFieldNumber*;
++    mir::protobuf::RequestWithAuthority::kSurfaceIdFieldNumber*;
++    mir::protobuf::RequestWithAuthority::MergeFrom*;
++    mir::protobuf::RequestWithAuthority::MergePartialFromCodedStream*;
++    mir::protobuf::RequestWithAuthority::New*;
++    mir::protobuf::RequestWithAuthority::?RequestWithAuthority*;
++    mir::protobuf::RequestWithAuthority::RequestWithAuthority*;
++    mir::protobuf::RequestWithAuthority::SerializeWithCachedSizes*;
++    mir::protobuf::RequestWithAuthority::Swap*;
++    non-virtual?thunk?to?mir::protobuf::RequestWithAuthority::?RequestWithAuthority*;
++    typeinfo?for?mir::protobuf::RequestWithAuthority;
++    vtable?for?mir::protobuf::RequestWithAuthority;
    };
  } MIR_PROTOBUF_0.26;
 === modified file 'src/server/frontend/protobuf_message_processor.cpp'
 --- src/server/frontend/protobuf_message_processor.cpp	2017-03-09 12:42:29 +0000
 +++ src/server/frontend/protobuf_message_processor.cpp	2017-03-24 10:59:54 +0000
@@ -305,9 +305,9 @@
+         {
              invoke(this, display_server.get(), &protobuf::DisplayServer::stop_prompt_session, invocation);
+         }
--        else if ("request_drag_and_drop" == invocation.method_name())
++        else if ("request_operation" == invocation.method_name())
+         {
--            invoke(this, display_server.get(), &protobuf::DisplayServer::request_drag_and_drop, invocation);
++            invoke(this, display_server.get(), &protobuf::DisplayServer::request_operation, invocation);
+         }
          else if ("disconnect" == invocation.method_name())
+         {
@@ -322,10 +322,6 @@
+         {
              invoke(this, display_server.get(), &DisplayServer::configure_buffer_stream, invocation);
+         }
--        else if ("raise_surface" == invocation.method_name())
--        {
--            invoke(this, display_server.get(), &DisplayServer::raise_surface, invocation);
--        }
          else if ("translate_surface_to_screen" == invocation.method_name())
+         {
              try
 === modified file 'src/server/frontend/session_mediator.cpp'
 --- src/server/frontend/session_mediator.cpp	2017-03-15 09:30:18 +0000
 +++ src/server/frontend/session_mediator.cpp	2017-03-24 10:59:54 +0000
@@ -1153,36 +1153,15 @@
      done->Run();
+ }
--void mf::SessionMediator::raise_surface(
--    mir::protobuf::RaiseRequest const* request,
--    mir::protobuf::Void*,
--    google::protobuf::Closure* done)
--{
--    auto const session = weak_session.lock();
--    if (!session)
--        BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
--
--    auto const cookie     = request->cookie();
--    auto const surface_id = request->surface_id();
--
--    auto cookie_string = cookie.cookie();
--
--    std::vector<uint8_t> cookie_bytes(cookie_string.begin(), cookie_string.end());
--    auto const cookie_ptr = cookie_authority->make_cookie(cookie_bytes);
--
--    shell->raise_surface(session, mf::SurfaceId{surface_id.value()}, cookie_ptr->timestamp());
--
--    done->Run();
--}
--
--void mir::frontend::SessionMediator::request_drag_and_drop(mir::protobuf::RequestAuthority const* request,
++void mir::frontend::SessionMediator::request_operation(
++    mir::protobuf::RequestWithAuthority const* request,
      mir::protobuf::Void*, google::protobuf::Closure* done)
+ {
      auto const session = weak_session.lock();
      if (!session)
          BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
--    auto const cookie     = request->cookie();
++    auto const cookie     = request->authority();
      auto const surface_id = request->surface_id();
      auto cookie_string = cookie.cookie();
@@ -1190,7 +1169,19 @@
      std::vector<uint8_t> cookie_bytes(cookie_string.begin(), cookie_string.end());
      auto const cookie_ptr = cookie_authority->make_cookie(cookie_bytes);
--    shell->request_drag_and_drop(session, mf::SurfaceId{surface_id.value()}, cookie_ptr->timestamp());
++    switch (request->operation())
++    {
++    case mir::protobuf::RequestOperation::START_DRAG_AND_DROP:
++        shell->request_drag_and_drop(session, mf::SurfaceId{surface_id.value()}, cookie_ptr->timestamp());
++        break;
++
++    case mir::protobuf::RequestOperation::MAKE_ACTIVE:
++        shell->raise_surface(session, mf::SurfaceId{surface_id.value()}, cookie_ptr->timestamp());
++        break;
++
++    default:
++        break;
++    }
      done->Run();
+ }
 === modified file 'src/server/frontend/session_mediator.h'
 --- src/server/frontend/session_mediator.h	2017-03-15 09:30:18 +0000
 +++ src/server/frontend/session_mediator.h	2017-03-24 10:59:54 +0000
@@ -245,12 +245,8 @@
          mir::protobuf::StreamConfiguration const* request,
          mir::protobuf::Void*,
          google::protobuf::Closure* done) override;
--    void raise_surface(
--        mir::protobuf::RaiseRequest const* request,
--        mir::protobuf::Void*,
--        google::protobuf::Closure* done) override;
--    void request_drag_and_drop(
--        mir::protobuf::RequestAuthority const* request,
++    void request_operation(
++        mir::protobuf::RequestWithAuthority const* request,
          mir::protobuf::Void*,
          google::protobuf::Closure* done) override;
      void apply_input_configuration(
 === modified file 'tests/include/mir/test/doubles/stub_display_server.h'
 --- tests/include/mir/test/doubles/stub_display_server.h	2017-03-08 12:13:23 +0000
 +++ tests/include/mir/test/doubles/stub_display_server.h	2017-03-24 10:59:54 +0000
@@ -29,147 +29,135 @@
+ {
  struct StubDisplayServer : public mir::frontend::detail::DisplayServer
+ {
--    void client_pid(int /*pid*/) {}
++    void client_pid(int /*pid*/) override {}
      void connect(
          mir::protobuf::ConnectParameters const* /*request*/,
          mir::protobuf::Connection* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void disconnect(
          mir::protobuf::Void const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void create_surface(
          mir::protobuf::SurfaceParameters const* /*request*/,
          mir::protobuf::Surface* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void modify_surface(
          mir::protobuf::SurfaceModifications const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
--    void swap_buffers(
--        mir::protobuf::SurfaceId const* /*request*/,
--        mir::protobuf::Buffer* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void release_surface(
          mir::protobuf::SurfaceId const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void platform_operation(
          mir::protobuf::PlatformOperationMessage const* /*request*/,
          mir::protobuf::PlatformOperationMessage* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void configure_surface(
          mir::protobuf::SurfaceSetting const* /*request*/,
          mir::protobuf::SurfaceSetting* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void configure_display(
          mir::protobuf::DisplayConfiguration const* /*request*/,
          mir::protobuf::DisplayConfiguration* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void remove_session_configuration(
          mir::protobuf::Void const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void set_base_display_configuration(
          mir::protobuf::DisplayConfiguration const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void preview_base_display_configuration(
          mir::protobuf::PreviewConfiguration const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void confirm_base_display_configuration(
          mir::protobuf::DisplayConfiguration const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void cancel_base_display_configuration_preview(
          mir::protobuf::Void const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void create_screencast(
          mir::protobuf::ScreencastParameters const* /*request*/,
          mir::protobuf::Screencast* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void screencast_buffer(
          mir::protobuf::ScreencastId const* /*request*/,
          mir::protobuf::Buffer* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void screencast_to_buffer(
          mir::protobuf::ScreencastRequest const*,
          mir::protobuf::Void*,
--        google::protobuf::Closure*) {}
++        google::protobuf::Closure*) override {}
      void release_screencast(
          mir::protobuf::ScreencastId const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void create_buffer_stream(
          mir::protobuf::BufferStreamParameters const* /*request*/,
          mir::protobuf::BufferStream* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void release_buffer_stream(
          mir::protobuf::BufferStreamId const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void configure_cursor(
          mir::protobuf::CursorSetting const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void new_fds_for_prompt_providers(
          mir::protobuf::SocketFDRequest const* /*request*/,
          mir::protobuf::SocketFD* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void start_prompt_session(
          mir::protobuf::PromptSessionParameters const* /*request*/,
          mir::protobuf::PromptSession* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void stop_prompt_session(
          mir::protobuf::PromptSession const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
--    void exchange_buffer(
--        mir::protobuf::BufferRequest const* /*request*/,
--        mir::protobuf::Buffer* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void submit_buffer(
          mir::protobuf::BufferRequest const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void allocate_buffers(
          mir::protobuf::BufferAllocation const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void release_buffers(
          mir::protobuf::BufferRelease const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void request_persistent_surface_id(
          mir::protobuf::SurfaceId const* /*request*/,
          mir::protobuf::PersistentSurfaceId* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void pong(
          mir::protobuf::PingEvent const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void configure_buffer_stream(
          mir::protobuf::StreamConfiguration const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
--    void raise_surface(
--        mir::protobuf::RaiseRequest const* /*request*/,
--        mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
--    void request_drag_and_drop(
--        mir::protobuf::RequestAuthority const* /*request*/,
--        mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
++    void request_operation(
++        mir::protobuf::RequestWithAuthority const* /*request*/,
++        mir::protobuf::Void* /*response*/,
++        google::protobuf::Closure* /*done*/) override {}
      void apply_input_configuration(
          mir::protobuf::InputConfigurationRequest const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
      void set_base_input_configuration(
          mir::protobuf::InputConfigurationRequest const* /*request*/,
          mir::protobuf::Void* /*response*/,
--        google::protobuf::Closure* /*done*/) {}
++        google::protobuf::Closure* /*done*/) override {}
  };
 === modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
 --- tests/unit-tests/frontend/test_session_mediator.cpp	2017-03-14 04:41:33 +0000
 +++ tests/unit-tests/frontend/test_session_mediator.cpp	2017-03-24 10:59:54 +0000
@@ -946,11 +946,13 @@
  TEST_F(SessionMediator, raise_with_invalid_cookie_throws)
+ {
--    mp::RaiseRequest raise_request;
++    mp::RequestWithAuthority raise_request;
++    raise_request.set_operation(mp::RequestOperation::MAKE_ACTIVE);
++
      mediator.connect(&connect_parameters, &connection, null_callback.get());
      EXPECT_THROW({
--        mediator.raise_surface(&raise_request, &void_response, null_callback.get());
++        mediator.request_operation(&raise_request, &void_response, null_callback.get());
      }, mir::cookie::SecurityCheckError);
+ }