← Back to branch summary

~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to include/test/mir_test/test_protobuf_client.h

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2014-07-15 13:05:54 UTC
  • mfrom: (1756.3.6 mir1)
  • Revision ID: tarmac-20140715130554-95pf71p17876i2zb
Tags: br0.5
client API, frontend, scene: remove support for mir_prompt_session_add_prompt_provider_sync()

Following discussions about security concerns and trusted prompt session lifecycle this function is both problematic and unnecessary. Helpers should be using mir_prompt_session_new_fds_for_prompt_providers() instead.

Approved by Cemil Azizoglu, PS Jenkins bot, Alberto Aguirre.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/test/mir_test/test_protobuf_client.h
51
51
    mir::protobuf::DisplayConfiguration disp_config;
52
52
    mir::protobuf::DisplayConfiguration disp_config_response;
53
53
    mir::protobuf::PromptSessionParameters prompt_session_parameters;
54
 
    mir::protobuf::PromptProvider prompt_provider;
55
54
    mir::protobuf::Void prompt_session;
56
55
 
57
56
    MOCK_METHOD0(connect_done, void());
62
61
    MOCK_METHOD0(drm_auth_magic_done, void());
63
62
    MOCK_METHOD0(display_configure_done, void());
64
63
    MOCK_METHOD0(prompt_session_start_done, void());
65
 
    MOCK_METHOD0(prompt_session_add_prompt_provider_done, void());
66
64
    MOCK_METHOD0(prompt_session_stop_done, void());
67
65
 
68
66
    void on_connect_done();
103
101
 
104
102
    void wait_for_prompt_session_start_done();
105
103
 
106
 
    void wait_for_prompt_session_add_prompt_provider_done();
107
 
 
108
104
    void wait_for_prompt_session_stop_done();
109
105
 
110
106
    const int maxwait;
118
114
    std::atomic<bool> tfd_done_called;
119
115
 
120
116
    WaitCondition wc_prompt_session_start;
121
 
    WaitCondition wc_prompt_session_add;
122
117
    WaitCondition wc_prompt_session_stop;
123
118
 
124
119
    std::atomic<int> connect_done_count;