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

chrome/browser/importer/importer_bridge.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/browser/importer/importer_bridge.h"
 
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 40 matching lines @@
 void InProcessImporterBridge::AddIE7PasswordInfo(
     const IE7PasswordInfo password_info) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(writer_, &ProfileWriter::AddIE7PasswordInfo,
       password_info));
 }
 #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(
     const std::vector<history::URLRow> &rows,
     history::VisitSource visit_source) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(writer_, &ProfileWriter::AddHistoryPage,
                         rows, visit_source));
 }
@@ skipping 70 matching lines @@
 }
 
 #if defined(OS_WIN)
 void ExternalProcessImporterBridge::AddIE7PasswordInfo(
     const IE7PasswordInfo password_info) {
   NOTIMPLEMENTED();
 }
 #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(
     const std::vector<history::URLRow> &rows,
     history::VisitSource visit_source) {
   profile_import_thread_->NotifyHistoryImportReady(rows, visit_source);
 }
 
 void ExternalProcessImporterBridge::SetKeywords(
     const std::vector<TemplateURL*>& template_urls,
@@ skipping 27 matching lines @@
 
 // TODO(viettrungluu): convert to string16.
 std::wstring ExternalProcessImporterBridge::GetLocalizedString(
     int message_id) {
   string16 message;
   localized_strings_->GetString(base::IntToString(message_id), &message);
   return UTF16ToWideHack(message);
 }
 
 ExternalProcessImporterBridge::~ExternalProcessImporterBridge() {}