OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" | 5 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "content/browser/renderer_host/render_view_host_delegate.h" | 8 #include "content/browser/renderer_host/render_view_host_delegate.h" |
9 #include "content/public/common/renderer_preferences.h" | 9 #include "content/public/common/renderer_preferences.h" |
10 #include "content/public/test/test_browser_thread.h" | 10 #include "content/public/test/test_browser_thread.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 expected.tab_capture_device_id == arg.tab_capture_device_id && | 88 expected.tab_capture_device_id == arg.tab_capture_device_id && |
89 expected.security_origin == arg.security_origin && | 89 expected.security_origin == arg.security_origin && |
90 expected.request_type == arg.request_type && | 90 expected.request_type == arg.request_type && |
91 expected.requested_audio_device_id == arg.requested_audio_device_id && | 91 expected.requested_audio_device_id == arg.requested_audio_device_id && |
92 expected.requested_video_device_id == arg.requested_video_device_id && | 92 expected.requested_video_device_id == arg.requested_video_device_id && |
93 expected.audio_type == arg.audio_type && | 93 expected.audio_type == arg.audio_type && |
94 expected.video_type == arg.video_type; | 94 expected.video_type == arg.video_type; |
95 } | 95 } |
96 | 96 |
97 TEST_F(MediaStreamUIProxyTest, Deny) { | 97 TEST_F(MediaStreamUIProxyTest, Deny) { |
98 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), | 98 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), false, |
99 MEDIA_GENERATE_STREAM, std::string(), | 99 MEDIA_GENERATE_STREAM, std::string(), |
100 std::string(), | 100 std::string(), |
101 MEDIA_DEVICE_AUDIO_CAPTURE, | 101 MEDIA_DEVICE_AUDIO_CAPTURE, |
102 MEDIA_DEVICE_VIDEO_CAPTURE); | 102 MEDIA_DEVICE_VIDEO_CAPTURE); |
103 proxy_->RequestAccess( | 103 proxy_->RequestAccess( |
104 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, | 104 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, |
105 base::Unretained(&response_callback_))); | 105 base::Unretained(&response_callback_))); |
106 MediaResponseCallback callback; | 106 MediaResponseCallback callback; |
107 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) | 107 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) |
108 .WillOnce(SaveArg<1>(&callback)); | 108 .WillOnce(SaveArg<1>(&callback)); |
109 message_loop_.RunUntilIdle(); | 109 message_loop_.RunUntilIdle(); |
110 ASSERT_FALSE(callback.is_null()); | 110 ASSERT_FALSE(callback.is_null()); |
111 | 111 |
112 MediaStreamDevices devices; | 112 MediaStreamDevices devices; |
113 callback.Run(devices, MEDIA_DEVICE_OK, scoped_ptr<MediaStreamUI>()); | 113 callback.Run(devices, MEDIA_DEVICE_OK, scoped_ptr<MediaStreamUI>()); |
114 | 114 |
115 MediaStreamDevices response; | 115 MediaStreamDevices response; |
116 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _)) | 116 EXPECT_CALL(response_callback_, OnAccessRequestResponse(_, _)) |
117 .WillOnce(SaveArg<0>(&response)); | 117 .WillOnce(SaveArg<0>(&response)); |
118 message_loop_.RunUntilIdle(); | 118 message_loop_.RunUntilIdle(); |
119 | 119 |
120 EXPECT_TRUE(response.empty()); | 120 EXPECT_TRUE(response.empty()); |
121 } | 121 } |
122 | 122 |
123 TEST_F(MediaStreamUIProxyTest, AcceptAndStart) { | 123 TEST_F(MediaStreamUIProxyTest, AcceptAndStart) { |
124 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), | 124 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), false, |
125 MEDIA_GENERATE_STREAM, std::string(), | 125 MEDIA_GENERATE_STREAM, std::string(), |
126 std::string(), | 126 std::string(), |
127 MEDIA_DEVICE_AUDIO_CAPTURE, | 127 MEDIA_DEVICE_AUDIO_CAPTURE, |
128 MEDIA_DEVICE_VIDEO_CAPTURE); | 128 MEDIA_DEVICE_VIDEO_CAPTURE); |
129 proxy_->RequestAccess( | 129 proxy_->RequestAccess( |
130 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, | 130 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, |
131 base::Unretained(&response_callback_))); | 131 base::Unretained(&response_callback_))); |
132 MediaResponseCallback callback; | 132 MediaResponseCallback callback; |
133 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) | 133 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) |
134 .WillOnce(SaveArg<1>(&callback)); | 134 .WillOnce(SaveArg<1>(&callback)); |
(...skipping 13 matching lines...) Expand all Loading... |
148 message_loop_.RunUntilIdle(); | 148 message_loop_.RunUntilIdle(); |
149 | 149 |
150 EXPECT_FALSE(response.empty()); | 150 EXPECT_FALSE(response.empty()); |
151 | 151 |
152 proxy_->OnStarted(base::Closure(), MediaStreamUIProxy::WindowIdCallback()); | 152 proxy_->OnStarted(base::Closure(), MediaStreamUIProxy::WindowIdCallback()); |
153 message_loop_.RunUntilIdle(); | 153 message_loop_.RunUntilIdle(); |
154 } | 154 } |
155 | 155 |
156 // Verify that the proxy can be deleted before the request is processed. | 156 // Verify that the proxy can be deleted before the request is processed. |
157 TEST_F(MediaStreamUIProxyTest, DeleteBeforeAccepted) { | 157 TEST_F(MediaStreamUIProxyTest, DeleteBeforeAccepted) { |
158 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), | 158 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), false, |
159 MEDIA_GENERATE_STREAM, std::string(), | 159 MEDIA_GENERATE_STREAM, std::string(), |
160 std::string(), | 160 std::string(), |
161 MEDIA_DEVICE_AUDIO_CAPTURE, | 161 MEDIA_DEVICE_AUDIO_CAPTURE, |
162 MEDIA_DEVICE_VIDEO_CAPTURE); | 162 MEDIA_DEVICE_VIDEO_CAPTURE); |
163 proxy_->RequestAccess( | 163 proxy_->RequestAccess( |
164 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, | 164 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, |
165 base::Unretained(&response_callback_))); | 165 base::Unretained(&response_callback_))); |
166 MediaResponseCallback callback; | 166 MediaResponseCallback callback; |
167 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) | 167 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) |
168 .WillOnce(SaveArg<1>(&callback)); | 168 .WillOnce(SaveArg<1>(&callback)); |
169 message_loop_.RunUntilIdle(); | 169 message_loop_.RunUntilIdle(); |
170 ASSERT_FALSE(callback.is_null()); | 170 ASSERT_FALSE(callback.is_null()); |
171 | 171 |
172 proxy_.reset(); | 172 proxy_.reset(); |
173 | 173 |
174 MediaStreamDevices devices; | 174 MediaStreamDevices devices; |
175 scoped_ptr<MediaStreamUI> ui; | 175 scoped_ptr<MediaStreamUI> ui; |
176 callback.Run(devices, MEDIA_DEVICE_OK, ui.Pass()); | 176 callback.Run(devices, MEDIA_DEVICE_OK, ui.Pass()); |
177 } | 177 } |
178 | 178 |
179 TEST_F(MediaStreamUIProxyTest, StopFromUI) { | 179 TEST_F(MediaStreamUIProxyTest, StopFromUI) { |
180 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), | 180 MediaStreamRequest request(0, 0, 0, GURL("http://origin/"), false, |
181 MEDIA_GENERATE_STREAM, std::string(), | 181 MEDIA_GENERATE_STREAM, std::string(), |
182 std::string(), | 182 std::string(), |
183 MEDIA_DEVICE_AUDIO_CAPTURE, | 183 MEDIA_DEVICE_AUDIO_CAPTURE, |
184 MEDIA_DEVICE_VIDEO_CAPTURE); | 184 MEDIA_DEVICE_VIDEO_CAPTURE); |
185 proxy_->RequestAccess( | 185 proxy_->RequestAccess( |
186 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, | 186 request, base::Bind(&MockResponseCallback::OnAccessRequestResponse, |
187 base::Unretained(&response_callback_))); | 187 base::Unretained(&response_callback_))); |
188 MediaResponseCallback callback; | 188 MediaResponseCallback callback; |
189 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) | 189 EXPECT_CALL(delegate_, RequestMediaAccessPermission(SameRequest(request), _)) |
190 .WillOnce(SaveArg<1>(&callback)); | 190 .WillOnce(SaveArg<1>(&callback)); |
(...skipping 27 matching lines...) Expand all Loading... |
218 EXPECT_CALL(stop_handler, OnStop()); | 218 EXPECT_CALL(stop_handler, OnStop()); |
219 stop_callback.Run(); | 219 stop_callback.Run(); |
220 message_loop_.RunUntilIdle(); | 220 message_loop_.RunUntilIdle(); |
221 } | 221 } |
222 | 222 |
223 TEST_F(MediaStreamUIProxyTest, WindowIdCallbackCalled) { | 223 TEST_F(MediaStreamUIProxyTest, WindowIdCallbackCalled) { |
224 MediaStreamRequest request(0, | 224 MediaStreamRequest request(0, |
225 0, | 225 0, |
226 0, | 226 0, |
227 GURL("http://origin/"), | 227 GURL("http://origin/"), |
| 228 false, |
228 MEDIA_GENERATE_STREAM, | 229 MEDIA_GENERATE_STREAM, |
229 std::string(), | 230 std::string(), |
230 std::string(), | 231 std::string(), |
231 MEDIA_NO_SERVICE, | 232 MEDIA_NO_SERVICE, |
232 MEDIA_DESKTOP_VIDEO_CAPTURE); | 233 MEDIA_DESKTOP_VIDEO_CAPTURE); |
233 proxy_->RequestAccess( | 234 proxy_->RequestAccess( |
234 request, | 235 request, |
235 base::Bind(&MockResponseCallback::OnAccessRequestResponse, | 236 base::Bind(&MockResponseCallback::OnAccessRequestResponse, |
236 base::Unretained(&response_callback_))); | 237 base::Unretained(&response_callback_))); |
237 MediaResponseCallback callback; | 238 MediaResponseCallback callback; |
(...skipping 13 matching lines...) Expand all Loading... |
251 EXPECT_CALL(handler, OnWindowId(kWindowId)); | 252 EXPECT_CALL(handler, OnWindowId(kWindowId)); |
252 | 253 |
253 proxy_->OnStarted( | 254 proxy_->OnStarted( |
254 base::Bind(&MockStopStreamHandler::OnStop, base::Unretained(&handler)), | 255 base::Bind(&MockStopStreamHandler::OnStop, base::Unretained(&handler)), |
255 base::Bind(&MockStopStreamHandler::OnWindowId, | 256 base::Bind(&MockStopStreamHandler::OnWindowId, |
256 base::Unretained(&handler))); | 257 base::Unretained(&handler))); |
257 message_loop_.RunUntilIdle(); | 258 message_loop_.RunUntilIdle(); |
258 } | 259 } |
259 | 260 |
260 } // content | 261 } // content |
OLD | NEW |