Fix some grammar in sync/

sync/engine/conflict_resolver.cc

 // 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.
 
 #include "sync/engine/conflict_resolver.h"
 
 #include <algorithm>
 #include <list>
 #include <map>
 #include <set>
@@ skipping 139 matching lines @@
     // consider the position to have remained the same for D, and will unset
     // it's UNSYNCED/UNAPPLIED bits. When we evaluate C though, we'll see that
     // the prev id is D locally while the server's prev id is a. C will
     // therefore count as a positional conflict (and the local data will be
     // overwritten by the server data typically). The final result will be
     // aCDbe (the same as the server's view). Even though both C and D were
     // modified, only one counted as being in actual conflict and was resolved
     // with local/server wins.
     //
     // In general, when there are chains of positional conflicts, only the first
-    // item in chain (based on the clients point of view) will have both it's
+    // item in chain (based on the clients point of view) will have both its
     // server prev id and local prev id match. For all the rest the server prev
     // id will be the predecessor of the first item in the chain, and therefore
     // not match the local prev id.
     //
     // Similarly, chains of conflicts where the server and client info are the
     // same are supported due to the predecessor->successor ordering. In this
     // case, from the first item onward, we unset the UNSYNCED/UNAPPLIED bits as
     // we decide that nothing changed. The subsequent item's server prev id will
     // accurately match the local prev id because the predecessor is no longer
     // UNSYNCED/UNAPPLIED.
@@ skipping 68 matching lines @@
       if (cryptographer->is_ready()) {
         cryptographer->GetKeys(server_nigori->mutable_encrypted());
       }
       // TODO(zea): Find a better way of doing this. As it stands, we have to
       // update this code whenever we add a new non-cryptographer related field
       // to the nigori node.
       if (entry.Get(syncable::SPECIFICS).nigori().sync_tabs()) {
         server_nigori->set_sync_tabs(true);
       }
       // We deliberately leave the server's device information. This client will
-      // add it's own device information on restart.
+      // add its own device information on restart.
       entry.Put(syncable::SPECIFICS, specifics);
       DVLOG(1) << "Resovling simple conflict, merging nigori nodes: " << entry;

[ncarter (slow), 2012/03/28 23:37:44]

We could fix the spelling of Resovling here.

       status->increment_num_server_overwrites();
       OverwriteServerChanges(trans, &entry);
       UMA_HISTOGRAM_ENUMERATION("Sync.ResolveSimpleConflict",
                                 NIGORI_MERGE,
                                 CONFLICT_RESOLUTION_SIZE);
     } else if (!entry_deleted && name_matches && parent_matches &&
                specifics_match && !needs_reinsertion) {
       DVLOG(1) << "Resolving simple conflict, everything matches, ignoring "
                << "changes for: " << entry;
       // This unsets both IS_UNSYNCED and IS_UNAPPLIED_UPDATE, and sets the
@@ skipping 133 matching lines @@
           forward_progress = true;
           break;
       }
       processed_items.insert(id);
     }
   }
   return forward_progress;
 }
 
 }  // namespace browser_sync