Fix a whole bunch of style nits.

(Long term intention is to add a subset of cpplint.py to the presubmit script.)

Review URL: http://codereview.chromium.org/276008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28914 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 13 insertions, 8 deletions

diff --git a/base/condition_variable_unittest.cc b/base/condition_variable_unittest.cc
index c49a8cb..345d141 100644
--- a/base/condition_variable_unittest.cc
+++ b/base/condition_variable_unittest.cc
@@ -229,7 +229,7 @@ TEST_F(ConditionVariableTest, DISABLED_MultiThreadConsumerTest) {
   {
     // Wait until all 10 work tasks have at least been assigned.
     AutoLock auto_lock(*queue.lock());
-    while(queue.task_count())
+    while (queue.task_count())
       queue.no_more_tasks()->Wait();
     // The last of the tasks *might* still be running, but... all but one should
     // be done by now, since tasks are being done serially.
@@ -287,7 +287,7 @@ TEST_F(ConditionVariableTest, DISABLED_MultiThreadConsumerTest) {
   {
     // Wait until all work tasks have at least been assigned.
     AutoLock auto_lock(*queue.lock());
-    while(queue.task_count())
+    while (queue.task_count())
       queue.no_more_tasks()->Wait();
     // Since they can all run almost in parallel, there is no guarantee that all
     // tasks are finished, but we should have gotten here faster than it would
diff --git a/base/debug_on_start.cc b/base/debug_on_start.cc
index 9011ca2..9cabde5 100644
--- a/base/debug_on_start.cc
+++ b/base/debug_on_start.cc
@@ -16,8 +16,7 @@
 // The code is not that bright and will find things like ---argument or
 // /-/argument.
 // Note: command_line is non-destructively modified.
-bool DebugOnStart::FindArgument(wchar_t* command_line, const char* argument_c)
-{
+bool DebugOnStart::FindArgument(wchar_t* command_line, const char* argument_c) {
   wchar_t argument[50];
   for (int i = 0; argument_c[i]; ++i)
     argument[i] = argument_c[i];
diff --git a/base/debug_util_mac.cc b/base/debug_util_mac.cc
index 77ab0ff..78679f2 100644
--- a/base/debug_util_mac.cc
+++ b/base/debug_util_mac.cc
@@ -21,7 +21,7 @@ void DebugUtil::DisableOSCrashDumps() {
   // Apple Crash Reporter handles.  See ux_exception() in xnu's
   // bsd/uxkern/ux_exception.c and machine_exception() in xnu's
   // bsd/dev/*/unix_signal.c.
-  const int signals_to_intercept[] ={
+  const int signals_to_intercept[] = {
     SIGILL,   // EXC_BAD_INSTRUCTION
     SIGTRAP,  // EXC_BREAKPOINT
     SIGFPE,   // EXC_ARITHMETIC
diff --git a/base/debug_util_unittest.cc b/base/debug_util_unittest.cc
index e81b1b7..01551d0 100644
--- a/base/debug_util_unittest.cc
+++ b/base/debug_util_unittest.cc
@@ -28,7 +28,7 @@ TEST(StackTrace, OutputToStream) {
       "Unable to resolve symbols.  Skipping rest of test.";
 
 #if 0
-//TODO(ajwong): Disabling checking of symbol resolution since it depends
+// TODO(ajwong): Disabling checking of symbol resolution since it depends
 //  on whether or not symbols are present, and there are too many
 //  configurations to reliably ensure that symbols are findable.
 #if defined(OS_MACOSX)
diff --git a/base/directory_watcher_unittest.cc b/base/directory_watcher_unittest.cc
index 625c5425..31a0dc4 100644
--- a/base/directory_watcher_unittest.cc
+++ b/base/directory_watcher_unittest.cc
@@ -118,7 +118,7 @@ class DirectoryWatcherTest : public testing::Test {
 
 class TestDelegate : public DirectoryWatcher::Delegate {
  public:
-  TestDelegate(DirectoryWatcherTest* test)
+  explicit TestDelegate(DirectoryWatcherTest* test)
       : test_(test),
         got_notification_(false),
         original_thread_id_(PlatformThread::CurrentId()) {
@@ -309,7 +309,13 @@ TEST_F(DirectoryWatcherTest, MultipleWatchersSingleFile) {
 TEST_F(DirectoryWatcherTest, MultipleWatchersDifferentFiles) {
   const int kNumberOfWatchers = 5;
   DirectoryWatcher watchers[kNumberOfWatchers];
-  TestDelegate delegates[kNumberOfWatchers] = {this, this, this, this, this};
+  TestDelegate delegates[kNumberOfWatchers] = {
+    TestDelegate(this),
+    TestDelegate(this),
+    TestDelegate(this),
+    TestDelegate(this),
+    TestDelegate(this)
+  };
   FilePath subdirs[kNumberOfWatchers];
   for (int i = 0; i < kNumberOfWatchers; i++) {
     subdirs[i] = CreateTestDirDirectoryASCII("Dir" + IntToString(i), false);