Fix some grammar in sync/

sync/engine/conflict_resolver.cc

Index: sync/engine/conflict_resolver.cc
diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc
index 17f76a4723e29b3ff14dd30d9a09b79031d1d275..67e59df931d717279e2025d95ea33d483df943fe 100644
--- a/sync/engine/conflict_resolver.cc
+++ b/sync/engine/conflict_resolver.cc
@@ -157,7 +157,7 @@ ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans,
     // 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.
@@ -246,7 +246,7 @@ ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans,
         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();