Index: net/dns/serial_worker_unittest.cc |
diff --git a/net/dns/serial_worker_unittest.cc b/net/dns/serial_worker_unittest.cc |
index 442526f29d21a3de66ff15d7af5cabbe7c5ad02f..a582fe9687d7daf9b635a4c7bd6c7362463ed297 100644 |
--- a/net/dns/serial_worker_unittest.cc |
+++ b/net/dns/serial_worker_unittest.cc |
@@ -19,8 +19,7 @@ class SerialWorkerTest : public testing::Test { |
// The class under test |
class TestSerialWorker : public SerialWorker { |
public: |
- explicit TestSerialWorker(SerialWorkerTest* t) |
- : test_(t) {} |
+ explicit TestSerialWorker(SerialWorkerTest* t) : test_(t) {} |
virtual void DoWork() OVERRIDE { |
ASSERT_TRUE(test_); |
test_->OnWork(); |
@@ -29,6 +28,7 @@ class SerialWorkerTest : public testing::Test { |
ASSERT_TRUE(test_); |
test_->OnWorkFinished(); |
} |
+ |
private: |
virtual ~TestSerialWorker() {} |
SerialWorkerTest* test_; |
@@ -37,7 +37,7 @@ class SerialWorkerTest : public testing::Test { |
// Mocks |
void OnWork() { |
- { // Check that OnWork is executed serially. |
+ { // Check that OnWork is executed serially. |
base::AutoLock lock(work_lock_); |
EXPECT_FALSE(work_running_) << "DoRead is not called serially!"; |
work_running_ = true; |
@@ -47,7 +47,7 @@ class SerialWorkerTest : public testing::Test { |
// Calling from WorkerPool, but protected by work_allowed_/work_called_. |
output_value_ = input_value_; |
- { // This lock might be destroyed after work_called_ is signalled. |
+ { // This lock might be destroyed after work_called_ is signalled. |
base::AutoLock lock(work_lock_); |
work_running_ = false; |
} |
@@ -67,9 +67,10 @@ class SerialWorkerTest : public testing::Test { |
} |
void BreakNow(std::string b) { |
- message_loop_->PostTask(FROM_HERE, |
- base::Bind(&SerialWorkerTest::BreakCallback, |
- base::Unretained(this), b)); |
+ message_loop_->PostTask( |
+ FROM_HERE, |
+ base::Bind( |
+ &SerialWorkerTest::BreakCallback, base::Unretained(this), b)); |
} |
void RunUntilBreak(std::string b) { |
@@ -82,8 +83,7 @@ class SerialWorkerTest : public testing::Test { |
output_value_(-1), |
work_allowed_(false, false), |
work_called_(false, false), |
- work_running_(false) { |
- } |
+ work_running_(false) {} |
// Helpers for tests. |
@@ -160,4 +160,3 @@ TEST_F(SerialWorkerTest, ExecuteAndSerializeReads) { |
} // namespace |
} // namespace net |
- |