diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/content/browser/browser_thread_unittest.cc | |
parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_thread_unittest.cc')
-rw-r--r-- | chromium/content/browser/browser_thread_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/content/browser/browser_thread_unittest.cc b/chromium/content/browser/browser_thread_unittest.cc index 191f017a04b..fb15a7e1d30 100644 --- a/chromium/content/browser/browser_thread_unittest.cc +++ b/chromium/content/browser/browser_thread_unittest.cc @@ -15,6 +15,7 @@ #include "base/run_loop.h" #include "base/sequenced_task_runner_helpers.h" #include "base/single_thread_task_runner.h" +#include "base/task/current_thread.h" #include "base/task/sequence_manager/sequence_manager_impl.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" @@ -159,7 +160,7 @@ class BrowserThreadTest : public testing::Test { }; class UIThreadDestructionObserver - : public base::MessageLoopCurrent::DestructionObserver { + : public base::CurrentThread::DestructionObserver { public: explicit UIThreadDestructionObserver(bool* did_shutdown, base::OnceClosure callback) @@ -172,10 +173,10 @@ class UIThreadDestructionObserver private: static void Watch(UIThreadDestructionObserver* observer) { - base::MessageLoopCurrent::Get()->AddDestructionObserver(observer); + base::CurrentThread::Get()->AddDestructionObserver(observer); } - // base::MessageLoopCurrent::DestructionObserver: + // base::CurrentThread::DestructionObserver: void WillDestroyCurrentMessageLoop() override { // Ensure that even during MessageLoop teardown the BrowserThread ID is // correctly associated with this thread and the BrowserThreadTaskRunner @@ -183,7 +184,7 @@ class UIThreadDestructionObserver EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI)); EXPECT_TRUE(ui_task_runner_->BelongsToCurrentThread()); - base::MessageLoopCurrent::Get()->RemoveDestructionObserver(this); + base::CurrentThread::Get()->RemoveDestructionObserver(this); *did_shutdown_ = true; callback_task_runner_->PostTask(FROM_HERE, std::move(callback_)); } |