summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 05:23:13 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 05:23:13 +0000
commitb7243c40f2c0e4742843d56d0a46c3d5ba2008d1 (patch)
treef3ba1cec0461cab175f637deab6a837cfbb4d105 /base
parent87a03a05c9dd5b2bf5fcf916526361f5c33b71de (diff)
downloadchromium_src-b7243c40f2c0e4742843d56d0a46c3d5ba2008d1.zip
chromium_src-b7243c40f2c0e4742843d56d0a46c3d5ba2008d1.tar.gz
chromium_src-b7243c40f2c0e4742843d56d0a46c3d5ba2008d1.tar.bz2
Random bits of header and whitespace cleanup.
BUG=none TEST=noe Review URL: http://codereview.chromium.org/3062003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/message_loop_unittest.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index 719a01a..bbfa56d 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <vector>
+
#include "base/eintr_wrapper.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -839,8 +841,8 @@ class Recursive2Tasks : public Task {
for (;;) {
HWND button = FindWindowEx(window, NULL, L"Button", NULL);
if (button != NULL) {
- EXPECT_TRUE(0 == SendMessage(button, WM_LBUTTONDOWN, 0, 0));
- EXPECT_TRUE(0 == SendMessage(button, WM_LBUTTONUP, 0, 0));
+ EXPECT_EQ(0, SendMessage(button, WM_LBUTTONDOWN, 0, 0));
+ EXPECT_EQ(0, SendMessage(button, WM_LBUTTONUP, 0, 0));
break;
}
}
@@ -1459,7 +1461,7 @@ TEST(MessageLoopTest, NonNestableDelayedInNestedLoop) {
class DummyTask : public Task {
public:
- DummyTask(int num_tasks) : num_tasks_(num_tasks) {}
+ explicit DummyTask(int num_tasks) : num_tasks_(num_tasks) {}
virtual void Run() {
if (num_tasks_ > 1) {
@@ -1477,7 +1479,7 @@ class DummyTask : public Task {
class DummyTaskObserver : public MessageLoop::TaskObserver {
public:
- DummyTaskObserver(int num_tasks)
+ explicit DummyTaskObserver(int num_tasks)
: num_tasks_started_(0),
num_tasks_processed_(0),
num_tasks_(num_tasks) {}
@@ -1593,7 +1595,7 @@ TEST(MessageLoopTest, FileDescriptorWatcherOutlivesMessageLoop) {
// pipe() is just the easiest way to do it.
int pipefds[2];
int err = pipe(pipefds);
- ASSERT_TRUE(err == 0);
+ ASSERT_EQ(0, err);
int fd = pipefds[1];
{
// Arrange for controller to live longer than message loop.
@@ -1618,7 +1620,7 @@ TEST(MessageLoopTest, FileDescriptorWatcherDoubleStop) {
// (Errors only showed up in valgrind.)
int pipefds[2];
int err = pipe(pipefds);
- ASSERT_TRUE(err == 0);
+ ASSERT_EQ(0, err);
int fd = pipefds[1];
{
// Arrange for message loop to live longer than controller.