summaryrefslogtreecommitdiff
path: root/chromium/base/run_loop.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-03 13:42:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:27:51 +0000
commit8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch)
treed29d987c4d7b173cf853279b79a51598f104b403 /chromium/base/run_loop.cc
parent830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff)
downloadqtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/base/run_loop.cc')
-rw-r--r--chromium/base/run_loop.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/base/run_loop.cc b/chromium/base/run_loop.cc
index 3b7bfde0cf9..467e2d8337a 100644
--- a/chromium/base/run_loop.cc
+++ b/chromium/base/run_loop.cc
@@ -63,7 +63,10 @@ void RunLoop::RegisterDelegateForCurrentThread(Delegate* delegate) {
DCHECK_CALLED_ON_VALID_THREAD(delegate->bound_thread_checker_);
// There can only be one RunLoop::Delegate per thread.
- DCHECK(!tls_delegate.Get().Get());
+ DCHECK(!tls_delegate.Get().Get())
+ << "Error: Multiple RunLoop::Delegates registered on the same thread.\n\n"
+ "Hint: You perhaps instantiated a second "
+ "MessageLoop/ScopedTaskEnvironment on a thread that already had one?";
tls_delegate.Get().Set(delegate);
delegate->bound_ = true;
}