diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
| commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
| tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/base/sequence_checker_unittest.cc | |
| parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
| download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz | |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/base/sequence_checker_unittest.cc')
| -rw-r--r-- | chromium/base/sequence_checker_unittest.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chromium/base/sequence_checker_unittest.cc b/chromium/base/sequence_checker_unittest.cc index ad77db0999d..0aa0f9cdbb7 100644 --- a/chromium/base/sequence_checker_unittest.cc +++ b/chromium/base/sequence_checker_unittest.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop/message_loop.h" #include "base/sequence_checker.h" +#include "base/single_thread_task_runner.h" #include "base/test/sequenced_worker_pool_owner.h" #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" @@ -56,14 +56,12 @@ class SequenceCheckerTest : public testing::Test { public: SequenceCheckerTest() : other_thread_("sequence_checker_test_other_thread") {} - virtual ~SequenceCheckerTest() {} - - virtual void SetUp() override { + void SetUp() override { other_thread_.Start(); ResetPool(); } - virtual void TearDown() override { + void TearDown() override { other_thread_.Stop(); pool()->Shutdown(); } @@ -86,10 +84,9 @@ class SequenceCheckerTest : public testing::Test { void PostDoStuffToOtherThread( SequenceCheckedObject* sequence_checked_object) { - other_thread()->message_loop()->PostTask( - FROM_HERE, - base::Bind(&SequenceCheckedObject::DoStuff, - base::Unretained(sequence_checked_object))); + other_thread()->task_runner()->PostTask( + FROM_HERE, base::Bind(&SequenceCheckedObject::DoStuff, + base::Unretained(sequence_checked_object))); } void PostDeleteToOtherThread( |