A large number of style nits in preparation for turning on automated cpplint.py.

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

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

5 files changed, 11 insertions, 10 deletions

diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
index 0cc1ac6..8277859 100644
--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
@@ -54,8 +54,8 @@ bool BuildAndProcessConflictSetsCommand::ProcessSingleDirectionConflictSets(
   bool rv = false;
   ConflictResolutionView conflict_view(session);
   set<ConflictSet*>::const_iterator all_sets_iterator;
-  for(all_sets_iterator = conflict_view.ConflictSetsBegin();
-      all_sets_iterator != conflict_view.ConflictSetsEnd() ; ) {
+  for (all_sets_iterator = conflict_view.ConflictSetsBegin();
+       all_sets_iterator != conflict_view.ConflictSetsEnd(); ) {
     const ConflictSet* conflict_set = *all_sets_iterator;
     CHECK(conflict_set->size() >= 2);
     // We scan the set to see if it consists of changes of only one type.
@@ -86,9 +86,9 @@ namespace {
 void StoreLocalDataForUpdateRollback(syncable::Entry* entry,
                                      syncable::EntryKernel* backup) {
   CHECK(!entry->Get(syncable::IS_UNSYNCED)) << " Storing Rollback data for "
-      "entry that's unsynced." << *entry ;
+      "entry that's unsynced." << *entry;
   CHECK(entry->Get(syncable::IS_UNAPPLIED_UPDATE)) << " Storing Rollback data "
-      "for entry that's not an unapplied update." << *entry ;
+      "for entry that's not an unapplied update." << *entry;
   *backup = entry->GetKernelCopy();
 }
 
diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc
index 61eec3c..f67ea52 100644
--- a/chrome/browser/sync/engine/conflict_resolver.cc
+++ b/chrome/browser/sync/engine/conflict_resolver.cc
@@ -389,7 +389,7 @@ ConflictResolver::ConflictSetCountMapKey ConflictResolver::GetSetKey(
   // binary_search in ProcessConflictSet.
   sort(set->begin(), set->end());
   std::stringstream rv;
-  for(ConflictSet::iterator i = set->begin() ; i != set->end() ; ++i )
+  for (ConflictSet::iterator i = set->begin() ; i != set->end() ; ++i )
     rv << *i << ".";
   return rv.str();
 }
@@ -399,7 +399,7 @@ namespace {
 bool AttemptToFixCircularConflict(WriteTransaction* trans,
                                   ConflictSet* conflict_set) {
   ConflictSet::const_iterator i, j;
-  for(i = conflict_set->begin() ; i != conflict_set->end() ; ++i) {
+  for (i = conflict_set->begin() ; i != conflict_set->end() ; ++i) {
     MutableEntry entryi(trans, syncable::GET_BY_ID, *i);
     if (entryi.Get(syncable::PARENT_ID) ==
             entryi.Get(syncable::SERVER_PARENT_ID) ||
@@ -655,7 +655,7 @@ bool ConflictResolver::ResolveSimpleConflicts(const ScopedDirLookup& dir,
   // First iterate over simple conflict items (those that belong to no set).
   set<Id>::const_iterator conflicting_item_it;
   for (conflicting_item_it = view->CommitConflictsBegin();
-       conflicting_item_it != view->CommitConflictsEnd() ;
+       conflicting_item_it != view->CommitConflictsEnd();
        ++conflicting_item_it) {
     Id id = *conflicting_item_it;
     map<Id, ConflictSet*>::const_iterator item_set_it =
@@ -663,7 +663,7 @@ bool ConflictResolver::ResolveSimpleConflicts(const ScopedDirLookup& dir,
     if (item_set_it == view->IdToConflictSetEnd() ||
         0 == item_set_it->second) {
       // We have a simple conflict.
-      switch(ProcessSimpleConflict(&trans, id, session)) {
+      switch (ProcessSimpleConflict(&trans, id, session)) {
         case NO_SYNC_PROGRESS:
           {
             int conflict_count = (simple_conflict_count_map_[id] += 2);
diff --git a/chrome/browser/sync/notifier/communicator/login.cc b/chrome/browser/sync/notifier/communicator/login.cc
index 90a0e70..de7fd3a 100644
--- a/chrome/browser/sync/notifier/communicator/login.cc
+++ b/chrome/browser/sync/notifier/communicator/login.cc
@@ -124,7 +124,7 @@ void Login::StartConnection() {
   single_attempt_->SignalRedirect.connect(this, &Login::OnRedirect);
   single_attempt_->SignalClientStateChange.connect(
       this,
-      &Login::OnClientStateChange) ;
+      &Login::OnClientStateChange);
   single_attempt_->SignalUnexpectedDisconnect.connect(
       this,
       &Login::OnUnexpectedDisconnect);
diff --git a/chrome/browser/sync/notifier/communicator/mailbox.cc b/chrome/browser/sync/notifier/communicator/mailbox.cc
index df8d7cf..5cabf04 100644
--- a/chrome/browser/sync/notifier/communicator/mailbox.cc
+++ b/chrome/browser/sync/notifier/communicator/mailbox.cc
@@ -31,7 +31,7 @@ static void ParseLabelSet(const std::string& text,
   char* result = new char[text.size() + 1];
   char* next_write = result;
 
-  while(input_cur < input_end) {
+  while (input_cur < input_end) {
     if (*input_cur == '|') {
       if (next_write != result) {
         *next_write = '\0';
diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc
index 2cc16bf..bf5ee91 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -1,3 +1,4 @@
+// Copyright (c) 2009 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.