Fix a few spelling mistakes.

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

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

3 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index f35939d..636c17f 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -122,7 +122,7 @@ void ProfileSyncService::StartUp() {
   registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED,
                  Source<Profile>(profile_));
 
-  // Create new model assocation manager and change processor.
+  // Create new model association manager and change processor.
   model_associator_ = new ModelAssociator(this);
   change_processor_->set_model_associator(model_associator_);
 
@@ -343,7 +343,7 @@ void ProfileSyncService::OnUserAcceptedMergeAndSync() {
   UMA_HISTOGRAM_MEDIUM_TIMES("Sync.UserPerceivedBookmarkAssociation",
                              base::TimeTicks::Now() - start_time);
   if (!merge_success) {
-    LOG(ERROR) << "Model assocation failed.";
+    LOG(ERROR) << "Model association failed.";
     OnUnrecoverableError();
     return;
   }
@@ -392,7 +392,7 @@ void ProfileSyncService::StartProcessingChangesIfReady() {
   UMA_HISTOGRAM_TIMES("Sync.BookmarkAssociationTime",
                       base::TimeTicks::Now() - start_time);
   if (!merge_success) {
-      LOG(ERROR) << "Model assocation failed.";
+      LOG(ERROR) << "Model association failed.";
       OnUnrecoverableError();
       return;
   }
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 8976703f..23ad03e 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -263,7 +263,7 @@ class ProfileSyncService : public NotificationObserver,
   // This specifies where to find the sync server.
   GURL sync_service_url_;
 
-  // Model assocation manager instance.
+  // Model association manager instance.
   scoped_refptr<browser_sync::ModelAssociator> model_associator_;
 
   // The last time we detected a successful transition from SYNCING state.
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 4287ee1..aa87866 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -1225,7 +1225,7 @@ TEST_F(ProfileSyncServiceTestWithData, MergeModelsWithSomeExtras) {
   ExpectBookmarkModelMatchesTestData();
 }
 
-// Tests that when persisted model assocations are used, things work fine.
+// Tests that when persisted model associations are used, things work fine.
 TEST_F(ProfileSyncServiceTestWithData, ModelAssociationPersistence) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   WriteTestDataToBookmarkModel();
@@ -1234,12 +1234,12 @@ TEST_F(ProfileSyncServiceTestWithData, ModelAssociationPersistence) {
   // Force the sync service to shut down and write itself to disk.
   StopSyncService(SAVE_TO_STORAGE);
   // Now restart the sync service. This time it should use the persistent
-  // assocations.
+  // associations.
   StartSyncService();
   ExpectModelMatch();
 }
 
-// Tests that when persisted model assocations are used, things work fine.
+// Tests that when persisted model associations are used, things work fine.
 TEST_F(ProfileSyncServiceTestWithData, ModelAssociationInvalidPersistence) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   WriteTestDataToBookmarkModel();