fav icon -> favicon. Pass 5: fav_icon -> favicon

chrome/profile_import/profile_import_thread.cc

Index: chrome/profile_import/profile_import_thread.cc
diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc
index 14c66f6d8d87fb5c8184a0c2a70cb42f58891a7a..a7dd12f5a97c3f729bd37a33b07b5b813cc0cf0a 100644
--- a/chrome/profile_import/profile_import_thread.cc
+++ b/chrome/profile_import/profile_import_thread.cc
@@ -157,20 +157,20 @@ void ProfileImportThread::NotifyBookmarksImportReady(
 }
 
 void ProfileImportThread::NotifyFavIconsImportReady(
-    const std::vector<history::ImportedFavIconUsage>& fav_icons) {
+    const std::vector<history::ImportedFavIconUsage>& favicons) {
   Send(new ProfileImportProcessHostMsg_NotifyFavIconsImportStart(
-    fav_icons.size()));
+    favicons.size()));
 
   std::vector<history::ImportedFavIconUsage>::const_iterator it;
-  for (it = fav_icons.begin(); it < fav_icons.end();
+  for (it = favicons.begin(); it < favicons.end();
        it = it + kNumFavIconsToSend) {
-    std::vector<history::ImportedFavIconUsage> fav_icons_group;
+    std::vector<history::ImportedFavIconUsage> favicons_group;
     std::vector<history::ImportedFavIconUsage>::const_iterator end_group =
-        std::min(it + kNumFavIconsToSend, fav_icons.end());
-    fav_icons_group.assign(it, end_group);
+        std::min(it + kNumFavIconsToSend, favicons.end());
+    favicons_group.assign(it, end_group);
 
   Send(new ProfileImportProcessHostMsg_NotifyFavIconsImportGroup(
-      fav_icons_group));
+      favicons_group));
   }
 }