Fix some grammar in comments, error messages and documentation.

Thanks to all my reviewers, you are legion.  I hope I didn't waste too
much of your time.

BUG=None

Review URL: http://codereview.chromium.org/9854039
Review URL: http://codereview.chromium.org/9854043
Review URL: http://codereview.chromium.org/9863058
Review URL: http://codereview.chromium.org/9863059
Review URL: http://codereview.chromium.org/9887005
Review URL: http://codereview.chromium.org/9890002
Review URL: http://codereview.chromium.org/9891002
Review URL: http://codereview.chromium.org/9895003
Review URL: http://codereview.chromium.org/9896002
Review URL: http://codereview.chromium.org/9896003
Review URL: http://codereview.chromium.org/9897002
Review URL: http://codereview.chromium.org/9897003
Review URL: http://codereview.chromium.org/9903004
Review URL: http://codereview.chromium.org/9904003
Review URL: http://codereview.chromium.org/9904002
Review URL: http://codereview.chromium.org/9904004
Review URL: http://codereview.chromium.org/9906002
Review URL: http://codereview.chromium.org/9906001
Review URL: http://codereview.chromium.org/9906003
Review URL: http://codereview.chromium.org/9909001
Review URL: http://codereview.chromium.org/9909002
Review URL: http://codereview.chromium.org/9909003
Review URL: http://codereview.chromium.org/9909004
Review URL: http://codereview.chromium.org/9910001
Review URL: http://codereview.chromium.org/9910002
Review URL: http://codereview.chromium.org/9910010
Review URL: http://codereview.chromium.org/9911001
Review URL: http://codereview.chromium.org/9912001

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

2 files changed, 4 insertions, 4 deletions

diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc
index a365e1c..705567d 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.
@@ -267,9 +267,9 @@ 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;
+      DVLOG(1) << "Resolving simple conflict, merging nigori nodes: " << entry;
       status->increment_num_server_overwrites();
       OverwriteServerChanges(trans, &entry);
       UMA_HISTOGRAM_ENUMERATION("Sync.ResolveSimpleConflict",
diff --git a/sync/engine/get_commit_ids_command.h b/sync/engine/get_commit_ids_command.h
index 0a277f9..334fb6b 100644
--- a/sync/engine/get_commit_ids_command.h
+++ b/sync/engine/get_commit_ids_command.h
@@ -81,7 +81,7 @@ class GetCommitIdsCommand : public SyncerCommand {
                const syncable::Entry& item,
                sessions::OrderedCommitSet* result) const;
 
-  // Adds item and all it's unsynced predecessors to |result| as necessary, as
+  // Adds item and all its unsynced predecessors to |result| as necessary, as
   // long as no item was in conflict.
   // Return values:
   //   False: if there was an entry in conflict.