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

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

Issue 2474923002: Fix race in MediaDevicesPermissionChecker. (Closed)
Patch Set: Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_devices_dispatcher_host.h" 5 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <queue> 10 #include <queue>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/memory/ptr_util.h"
16 #include "base/run_loop.h" 17 #include "base/run_loop.h"
17 #include "base/threading/thread_task_runner_handle.h" 18 #include "base/threading/thread_task_runner_handle.h"
18 #include "content/browser/renderer_host/media/media_stream_manager.h" 19 #include "content/browser/renderer_host/media/media_stream_manager.h"
19 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" 20 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
20 #include "content/browser/renderer_host/media/video_capture_manager.h" 21 #include "content/browser/renderer_host/media/video_capture_manager.h"
21 #include "content/public/browser/media_device_id.h" 22 #include "content/public/browser/media_device_id.h"
22 #include "content/public/test/mock_resource_context.h" 23 #include "content/public/test/mock_resource_context.h"
23 #include "content/public/test/test_browser_context.h" 24 #include "content/public/test/test_browser_context.h"
24 #include "content/public/test/test_browser_thread_bundle.h" 25 #include "content/public/test/test_browser_thread_bundle.h"
25 #include "media/audio/audio_device_description.h" 26 #include "media/audio/audio_device_description.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 const base::Closure& closure, 90 const base::Closure& closure,
90 const std::vector<std::vector<MediaDeviceInfo>>& devices) { 91 const std::vector<std::vector<MediaDeviceInfo>>& devices) {
91 enumerated_devices_ = devices; 92 enumerated_devices_ = devices;
92 closure.Run(); 93 closure.Run();
93 } 94 }
94 95
95 void EnumerateDevicesAndWaitForResult(bool enumerate_audio_input, 96 void EnumerateDevicesAndWaitForResult(bool enumerate_audio_input,
96 bool enumerate_video_input, 97 bool enumerate_video_input,
97 bool enumerate_audio_output, 98 bool enumerate_audio_output,
98 bool permission_override_value = true) { 99 bool permission_override_value = true) {
99 MediaDevicesPermissionChecker permission_checker; 100 host_->SetPermissionChecker(base::MakeUnique<MediaDevicesPermissionChecker>(
100 permission_checker.OverridePermissionsForTesting(permission_override_value); 101 permission_override_value));
101 host_->SetPermissionChecker(permission_checker);
102 base::RunLoop run_loop; 102 base::RunLoop run_loop;
103 host_->EnumerateDevices( 103 host_->EnumerateDevices(
104 enumerate_audio_input, enumerate_video_input, enumerate_audio_output, 104 enumerate_audio_input, enumerate_video_input, enumerate_audio_output,
105 origin_, base::Bind(&MediaDevicesDispatcherHostTest::DevicesEnumerated, 105 origin_, base::Bind(&MediaDevicesDispatcherHostTest::DevicesEnumerated,
106 base::Unretained(this), run_loop.QuitClosure())); 106 base::Unretained(this), run_loop.QuitClosure()));
107 run_loop.Run(); 107 run_loop.Run();
108 108
109 ASSERT_FALSE(enumerated_devices_.empty()); 109 ASSERT_FALSE(enumerated_devices_.empty());
110 if (enumerate_audio_input) 110 if (enumerate_audio_input)
111 EXPECT_FALSE(enumerated_devices_[MEDIA_DEVICE_TYPE_AUDIO_INPUT].empty()); 111 EXPECT_FALSE(enumerated_devices_[MEDIA_DEVICE_TYPE_AUDIO_INPUT].empty());
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 EnumerateDevicesAndWaitForResult(false, false, true, false); 230 EnumerateDevicesAndWaitForResult(false, false, true, false);
231 EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_)); 231 EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_));
232 } 232 }
233 233
234 TEST_F(MediaDevicesDispatcherHostTest, EnumerateAllDevicesNoAccess) { 234 TEST_F(MediaDevicesDispatcherHostTest, EnumerateAllDevicesNoAccess) {
235 EnumerateDevicesAndWaitForResult(true, true, true, false); 235 EnumerateDevicesAndWaitForResult(true, true, true, false);
236 EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_)); 236 EXPECT_TRUE(DoesNotContainLabels(enumerated_devices_));
237 } 237 }
238 238
239 }; // namespace content 239 }; // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698