diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
| commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
| tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/base/threading/thread.cc | |
| parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/base/threading/thread.cc')
| -rw-r--r-- | chromium/base/threading/thread.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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<FileDescriptorWatcher> 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<MessageLoopForIO*>(message_loop_))); } #endif |