Skip to content

Commit 16d96a6

Browse files
committed
Force MediaCaptureDevicesDispatcher to be created on UI thread
1 parent 19de41b commit 16d96a6

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

brightray/browser/browser_main_parts.cc

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "base/strings/utf_string_conversions.h"
1919
#include "brightray/browser/browser_context.h"
2020
#include "brightray/browser/devtools_manager_delegate.h"
21+
#include "brightray/browser/media/media_capture_devices_dispatcher.h"
2122
#include "brightray/browser/web_ui_controller_factory.h"
2223
#include "brightray/common/application_info.h"
2324
#include "brightray/common/main_delegate.h"
@@ -268,6 +269,9 @@ int BrowserMainParts::PreCreateThreads() {
268269
#endif
269270
#endif
270271

272+
// Force MediaCaptureDevicesDispatcher to be created on UI thread.
273+
MediaCaptureDevicesDispatcher::GetInstance();
274+
271275
if (!views::LayoutProvider::Get())
272276
layout_provider_.reset(new views::LayoutProvider());
273277

brightray/browser/media/media_capture_devices_dispatcher.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
4444
: is_device_enumeration_disabled_(false) {
4545
// MediaCaptureDevicesDispatcher is a singleton. It should be created on
4646
// UI thread.
47-
// FIXME: Ensure the DCHECK doesn't fail and then re-enable
48-
// DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
47+
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
4948
}
5049

5150
MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}

0 commit comments

Comments
 (0)