Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Side by Side Diff: content/browser/renderer_host/media/video_capture_host_unittest.cc

Issue 143003031: Allow retrieval of media device ID salt even after ResourceContext has gone away. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add TODO about proper fix. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 ASSERT_TRUE(opened_device_label_.empty()); 295 ASSERT_TRUE(opened_device_label_.empty());
296 296
297 // Enumerate video devices. 297 // Enumerate video devices.
298 StreamDeviceInfoArray devices; 298 StreamDeviceInfoArray devices;
299 { 299 {
300 base::RunLoop run_loop; 300 base::RunLoop run_loop;
301 std::string label = media_stream_manager_->EnumerateDevices( 301 std::string label = media_stream_manager_->EnumerateDevices(
302 &stream_requester_, 302 &stream_requester_,
303 render_process_id, 303 render_process_id,
304 render_view_id, 304 render_view_id,
305 browser_context_.GetResourceContext(), 305 browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
306 page_request_id, 306 page_request_id,
307 MEDIA_DEVICE_VIDEO_CAPTURE, 307 MEDIA_DEVICE_VIDEO_CAPTURE,
308 security_origin); 308 security_origin);
309 EXPECT_CALL(stream_requester_, DevicesEnumerated(render_view_id, 309 EXPECT_CALL(stream_requester_, DevicesEnumerated(render_view_id,
310 page_request_id, 310 page_request_id,
311 label, 311 label,
312 _)) 312 _))
313 .Times(1).WillOnce( 313 .Times(1).WillOnce(
314 DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), 314 DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()),
315 SaveArg<3>(&devices))); 315 SaveArg<3>(&devices)));
316 run_loop.Run(); 316 run_loop.Run();
317 Mock::VerifyAndClearExpectations(&stream_requester_); 317 Mock::VerifyAndClearExpectations(&stream_requester_);
318 media_stream_manager_->CancelRequest(label); 318 media_stream_manager_->CancelRequest(label);
319 } 319 }
320 ASSERT_FALSE(devices.empty()); 320 ASSERT_FALSE(devices.empty());
321 ASSERT_EQ(StreamDeviceInfo::kNoId, devices[0].session_id); 321 ASSERT_EQ(StreamDeviceInfo::kNoId, devices[0].session_id);
322 322
323 // Open the first device. 323 // Open the first device.
324 { 324 {
325 base::RunLoop run_loop; 325 base::RunLoop run_loop;
326 StreamDeviceInfo opened_device; 326 StreamDeviceInfo opened_device;
327 media_stream_manager_->OpenDevice( 327 media_stream_manager_->OpenDevice(
328 &stream_requester_, 328 &stream_requester_,
329 render_process_id, 329 render_process_id,
330 render_view_id, 330 render_view_id,
331 browser_context_.GetResourceContext(), 331 browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
332 page_request_id, 332 page_request_id,
333 devices[0].device.id, 333 devices[0].device.id,
334 MEDIA_DEVICE_VIDEO_CAPTURE, 334 MEDIA_DEVICE_VIDEO_CAPTURE,
335 security_origin); 335 security_origin);
336 EXPECT_CALL(stream_requester_, DeviceOpened(render_view_id, 336 EXPECT_CALL(stream_requester_, DeviceOpened(render_view_id,
337 page_request_id, 337 page_request_id,
338 _, 338 _,
339 _)) 339 _))
340 .Times(1).WillOnce( 340 .Times(1).WillOnce(
341 DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), 341 DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()),
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 #ifdef DUMP_VIDEO 503 #ifdef DUMP_VIDEO
504 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) { 504 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) {
505 CaptureAndDumpVideo(640, 480, 30); 505 CaptureAndDumpVideo(640, 480, 30);
506 } 506 }
507 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) { 507 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) {
508 CaptureAndDumpVideo(1280, 720, 30); 508 CaptureAndDumpVideo(1280, 720, 30);
509 } 509 }
510 #endif 510 #endif
511 511
512 } // namespace content 512 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/resource_context_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698