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

chrome/profile_import/profile_import_thread.cc

 // Copyright (c) 2011 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 "chrome/profile_import/profile_import_thread.h"
 
 #include <algorithm>
 
 #include "base/values.h"
 #include "chrome/browser/importer/importer_bridge.h"
@@ skipping 139 matching lines @@
         it + kNumBookmarksToSend < bookmarks.end() ?
         it + kNumBookmarksToSend : bookmarks.end();
     bookmark_group.assign(it, end_group);
 
     Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportGroup(
         bookmark_group));
   }
 }
 
 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));
   }
 }
 
 void ProfileImportThread::NotifyPasswordFormReady(
     const webkit_glue::PasswordForm& form) {
   Send(new ProfileImportProcessHostMsg_NotifyPasswordFormReady(form));
 }
 
 void ProfileImportThread::NotifyKeywordsReady(
     const std::vector<TemplateURL*>& template_urls,
         int default_keyword_index, bool unique_on_host_and_path) {
   std::vector<TemplateURL> urls;
   for (size_t i = 0; i < template_urls.size(); ++i) {
     urls.push_back(*template_urls[i]);
   }
   Send(new ProfileImportProcessHostMsg_NotifyKeywordsReady(urls,
       default_keyword_index, unique_on_host_and_path));
 }
 
 void ProfileImportThread::Cleanup() {
   importer_->Cancel();
   importer_ = NULL;
   bridge_ = NULL;
   ChildProcess::current()->ReleaseProcess();
 }