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

chrome/browser/importer/importer_bridge.cc

Index: chrome/browser/importer/importer_bridge.cc
diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc
index c7afd1a3f9df0bf2b7a4c6312abbb1ea04ce2b07..39b95d550379a2b69acdcd5620bf62f7bead859f 100644
--- a/chrome/browser/importer/importer_bridge.cc
+++ b/chrome/browser/importer/importer_bridge.cc
@@ -58,10 +58,10 @@ void InProcessImporterBridge::AddIE7PasswordInfo(
 #endif  // OS_WIN
 
 void InProcessImporterBridge::SetFavicons(
-    const std::vector<history::ImportedFavIconUsage>& fav_icons) {
+    const std::vector<history::ImportedFavIconUsage>& favicons) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(writer_, &ProfileWriter::AddFavicons, fav_icons));
+      NewRunnableMethod(writer_, &ProfileWriter::AddFavicons, favicons));
 }
 
 void InProcessImporterBridge::SetHistoryItems(
@@ -152,8 +152,8 @@ void ExternalProcessImporterBridge::AddIE7PasswordInfo(
 #endif
 
 void ExternalProcessImporterBridge::SetFavicons(
-    const std::vector<history::ImportedFavIconUsage>& fav_icons) {
-  profile_import_thread_->NotifyFavIconsImportReady(fav_icons);
+    const std::vector<history::ImportedFavIconUsage>& favicons) {
+  profile_import_thread_->NotifyFavIconsImportReady(favicons);
 }
 
 void ExternalProcessImporterBridge::SetHistoryItems(