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 <string> | 5 #include <string> |
6 #include <queue> | 6 #include <queue> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 // Make sure we use fake devices to avoid long delays. | 227 // Make sure we use fake devices to avoid long delays. |
228 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 228 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
229 switches::kUseFakeDeviceForMediaStream); | 229 switches::kUseFakeDeviceForMediaStream); |
230 // Create our own MediaStreamManager. | 230 // Create our own MediaStreamManager. |
231 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); | 231 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); |
232 video_capture_device_factory_ = | 232 video_capture_device_factory_ = |
233 static_cast<media::FakeVideoCaptureDeviceFactory*>( | 233 static_cast<media::FakeVideoCaptureDeviceFactory*>( |
234 media_stream_manager_->video_capture_manager() | 234 media_stream_manager_->video_capture_manager() |
235 ->video_capture_device_factory()); | 235 ->video_capture_device_factory()); |
236 DCHECK(video_capture_device_factory_); | 236 DCHECK(video_capture_device_factory_); |
237 #if defined(OS_WIN) | |
238 // Override the Video Capture Thread that MediaStreamManager constructs. | |
239 media_stream_manager_->video_capture_manager()->set_device_task_runner( | |
240 base::MessageLoopProxy::current()); | |
241 #endif | |
242 | 237 |
243 MockResourceContext* mock_resource_context = | 238 MockResourceContext* mock_resource_context = |
244 static_cast<MockResourceContext*>( | 239 static_cast<MockResourceContext*>( |
245 browser_context_.GetResourceContext()); | 240 browser_context_.GetResourceContext()); |
246 | 241 |
247 host_ = new MockMediaStreamDispatcherHost( | 242 host_ = new MockMediaStreamDispatcherHost( |
248 mock_resource_context->GetMediaDeviceIDSalt(), | 243 mock_resource_context->GetMediaDeviceIDSalt(), |
249 base::MessageLoopProxy::current(), | 244 base::MessageLoopProxy::current(), |
250 media_stream_manager_.get()); | 245 media_stream_manager_.get()); |
251 | 246 |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
918 | 913 |
919 TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevicesNoAccess) { | 914 TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevicesNoAccess) { |
920 SetupFakeUI(false); | 915 SetupFakeUI(false); |
921 stream_ui_->SetCameraAccess(false); | 916 stream_ui_->SetCameraAccess(false); |
922 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId, | 917 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId, |
923 MEDIA_DEVICE_VIDEO_CAPTURE); | 918 MEDIA_DEVICE_VIDEO_CAPTURE); |
924 EXPECT_TRUE(DoesNotContainLabels(host_->enumerated_devices_)); | 919 EXPECT_TRUE(DoesNotContainLabels(host_->enumerated_devices_)); |
925 } | 920 } |
926 | 921 |
927 }; // namespace content | 922 }; // namespace content |
OLD | NEW |