OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 StreamDeviceInfoArray devices; | 329 StreamDeviceInfoArray devices; |
330 { | 330 { |
331 base::RunLoop run_loop; | 331 base::RunLoop run_loop; |
332 std::string label = media_stream_manager_->EnumerateDevices( | 332 std::string label = media_stream_manager_->EnumerateDevices( |
333 &stream_requester_, | 333 &stream_requester_, |
334 render_process_id, | 334 render_process_id, |
335 render_view_id, | 335 render_view_id, |
336 browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(), | 336 browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(), |
337 page_request_id, | 337 page_request_id, |
338 MEDIA_DEVICE_VIDEO_CAPTURE, | 338 MEDIA_DEVICE_VIDEO_CAPTURE, |
339 security_origin); | 339 security_origin, |
| 340 true); |
340 EXPECT_CALL(stream_requester_, DevicesEnumerated(render_view_id, | 341 EXPECT_CALL(stream_requester_, DevicesEnumerated(render_view_id, |
341 page_request_id, | 342 page_request_id, |
342 label, | 343 label, |
343 _)) | 344 _)) |
344 .Times(1).WillOnce( | 345 .Times(1).WillOnce( |
345 DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), | 346 DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), |
346 SaveArg<3>(&devices))); | 347 SaveArg<3>(&devices))); |
347 run_loop.Run(); | 348 run_loop.Run(); |
348 Mock::VerifyAndClearExpectations(&stream_requester_); | 349 Mock::VerifyAndClearExpectations(&stream_requester_); |
349 media_stream_manager_->CancelRequest(label); | 350 media_stream_manager_->CancelRequest(label); |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
534 #ifdef DUMP_VIDEO | 535 #ifdef DUMP_VIDEO |
535 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) { | 536 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) { |
536 CaptureAndDumpVideo(640, 480, 30); | 537 CaptureAndDumpVideo(640, 480, 30); |
537 } | 538 } |
538 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) { | 539 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) { |
539 CaptureAndDumpVideo(1280, 720, 30); | 540 CaptureAndDumpVideo(1280, 720, 30); |
540 } | 541 } |
541 #endif | 542 #endif |
542 | 543 |
543 } // namespace content | 544 } // namespace content |
OLD | NEW |