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()->Unregister(); |
| 240 media_stream_manager_->video_capture_manager()->Register( |
| 241 media_stream_manager_.get(), |
| 242 base::MessageLoopProxy::current()); |
| 243 #endif |
237 | 244 |
238 MockResourceContext* mock_resource_context = | 245 MockResourceContext* mock_resource_context = |
239 static_cast<MockResourceContext*>( | 246 static_cast<MockResourceContext*>( |
240 browser_context_.GetResourceContext()); | 247 browser_context_.GetResourceContext()); |
241 | 248 |
242 host_ = new MockMediaStreamDispatcherHost( | 249 host_ = new MockMediaStreamDispatcherHost( |
243 mock_resource_context->GetMediaDeviceIDSalt(), | 250 mock_resource_context->GetMediaDeviceIDSalt(), |
244 base::MessageLoopProxy::current(), | 251 base::MessageLoopProxy::current(), |
245 media_stream_manager_.get()); | 252 media_stream_manager_.get()); |
246 | 253 |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
913 | 920 |
914 TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevicesNoAccess) { | 921 TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevicesNoAccess) { |
915 SetupFakeUI(false); | 922 SetupFakeUI(false); |
916 stream_ui_->SetCameraAccess(false); | 923 stream_ui_->SetCameraAccess(false); |
917 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId, | 924 EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId, |
918 MEDIA_DEVICE_VIDEO_CAPTURE); | 925 MEDIA_DEVICE_VIDEO_CAPTURE); |
919 EXPECT_TRUE(DoesNotContainLabels(host_->enumerated_devices_)); | 926 EXPECT_TRUE(DoesNotContainLabels(host_->enumerated_devices_)); |
920 } | 927 } |
921 | 928 |
922 }; // namespace content | 929 }; // namespace content |
OLD | NEW |