From d17ea114e5ef69ad5d5d7413280a13e6428098aa Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 15 May 2018 10:20:33 +0200 Subject: BASELINE: Update Chromium to 67.0.3396.47 Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7 Reviewed-by: Michal Klocek --- chromium/base/threading/thread.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chromium/base/threading/thread.cc') diff --git a/chromium/base/threading/thread.cc b/chromium/base/threading/thread.cc index 183f27e0a1d..97e160f91e8 100644 --- a/chromium/base/threading/thread.cc +++ b/chromium/base/threading/thread.cc @@ -308,9 +308,8 @@ void Thread::ThreadMain() { // Allow threads running a MessageLoopForIO to use FileDescriptorWatcher API. std::unique_ptr file_descriptor_watcher; if (MessageLoopForIO::IsCurrent()) { - DCHECK_EQ(message_loop_, MessageLoopForIO::current()); - file_descriptor_watcher.reset( - new FileDescriptorWatcher(MessageLoopForIO::current())); + file_descriptor_watcher.reset(new FileDescriptorWatcher( + static_cast(message_loop_))); } #endif -- cgit v1.2.3