diff options
Diffstat (limited to 'base/threading')
-rw-r--r-- | base/threading/sequenced_worker_pool_unittest.cc | 10 | ||||
-rw-r--r-- | base/threading/worker_pool_unittest.cc | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/base/threading/sequenced_worker_pool_unittest.cc b/base/threading/sequenced_worker_pool_unittest.cc index 42cf859..54ca01d 100644 --- a/base/threading/sequenced_worker_pool_unittest.cc +++ b/base/threading/sequenced_worker_pool_unittest.cc @@ -37,8 +37,7 @@ const size_t kNumWorkerThreads = 3; // provides a way to unblock a certain number of them. class ThreadBlocker { public: - ThreadBlocker() : lock_(), cond_var_(&lock_), unblock_counter_(0) { - } + ThreadBlocker() : lock_(), cond_var_(&lock_), unblock_counter_(0) {} void Block() { { @@ -79,6 +78,7 @@ class TestTracker : public base::RefCountedThreadSafe<TestTracker> { void FastTask(int id) { SignalWorkerDone(id); } + void SlowTask(int id) { base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); SignalWorkerDone(id); @@ -128,6 +128,9 @@ class TestTracker : public base::RefCountedThreadSafe<TestTracker> { } private: + friend class base::RefCountedThreadSafe<TestTracker>; + ~TestTracker() {} + void SignalWorkerDone(int id) { { base::AutoLock lock(lock_); @@ -152,7 +155,8 @@ class SequencedWorkerPoolTest : public testing::Test { public: SequencedWorkerPoolTest() : pool_owner_(kNumWorkerThreads, "test"), - tracker_(new TestTracker) {} + tracker_(new TestTracker) { + } virtual ~SequencedWorkerPoolTest() {} diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc index 4be06d3..0452335 100644 --- a/base/threading/worker_pool_unittest.cc +++ b/base/threading/worker_pool_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,8 +24,7 @@ namespace { class PostTaskAndReplyTester : public base::RefCountedThreadSafe<PostTaskAndReplyTester> { public: - PostTaskAndReplyTester() : finished_(false), test_event_(false, false) { - } + PostTaskAndReplyTester() : finished_(false), test_event_(false, false) {} void RunTest() { ASSERT_TRUE(thread_checker_.CalledOnValidThread()); @@ -55,6 +54,9 @@ class PostTaskAndReplyTester } private: + friend class base::RefCountedThreadSafe<PostTaskAndReplyTester>; + ~PostTaskAndReplyTester() {} + bool finished_; WaitableEvent test_event_; |