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

chrome/browser/importer/importer_bridge.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 16 matching lines @@
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
       const std::wstring& first_folder_name,
       int options) = 0;
   virtual void AddHomePage(const GURL &home_page) = 0;
 
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo password_info) = 0;
 #endif
 
   virtual void SetFavicons(
-      const std::vector<history::ImportedFavIconUsage>& fav_icons) = 0;
+      const std::vector<history::ImportedFavIconUsage>& favicons) = 0;
   virtual void SetHistoryItems(const std::vector<history::URLRow> &rows,
                                history::VisitSource visit_source) = 0;
   virtual void SetKeywords(const std::vector<TemplateURL*> &template_urls,
                            int default_keyword_index,
                            bool unique_on_host_and_path) = 0;
   virtual void SetPasswordForm(const webkit_glue::PasswordForm& form) = 0;
 
   // Notifies the coordinator that the import operation has begun.
   virtual void NotifyStarted() = 0;
 
@@ skipping 37 matching lines @@
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
       const std::wstring& first_folder_name,
       int options);
   virtual void AddHomePage(const GURL &home_page);
 
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo password_info);
 #endif
 
   virtual void SetFavicons(
-      const std::vector<history::ImportedFavIconUsage>& fav_icons);
+      const std::vector<history::ImportedFavIconUsage>& favicons);
   virtual void SetHistoryItems(const std::vector<history::URLRow> &rows,
                                history::VisitSource visit_source);
   virtual void SetKeywords(const std::vector<TemplateURL*>& template_urls,
                            int default_keyword_index,
                            bool unique_on_host_and_path);
   virtual void SetPasswordForm(const webkit_glue::PasswordForm& form);
 
   virtual void NotifyItemStarted(importer::ImportItem item);
   virtual void NotifyItemEnded(importer::ImportItem item);
   virtual void NotifyStarted();
@@ skipping 25 matching lines @@
   virtual void AddBookmarkEntries(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
       const std::wstring& first_folder_name, int options);
   virtual void AddHomePage(const GURL &home_page);
 
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo password_info);
 #endif
 
   virtual void SetFavicons(
-      const std::vector<history::ImportedFavIconUsage>& fav_icons);
+      const std::vector<history::ImportedFavIconUsage>& favicons);
   virtual void SetHistoryItems(const std::vector<history::URLRow> &rows,
                                history::VisitSource visit_source);
   virtual void SetKeywords(const std::vector<TemplateURL*>& template_urls,
                            int default_keyword_index,
                            bool unique_on_host_and_path);
   virtual void SetPasswordForm(const webkit_glue::PasswordForm& form);
 
   virtual void NotifyStarted();
   virtual void NotifyItemStarted(importer::ImportItem item);
   virtual void NotifyItemEnded(importer::ImportItem item);
   virtual void NotifyEnded();
 
   virtual std::wstring GetLocalizedString(int message_id);
 
  private:
   ~ExternalProcessImporterBridge();
 
   // Call back to send data and messages across IPC.
   ProfileImportThread* const profile_import_thread_;
 
   // Holds strings needed by the external importer because the resource
   // bundle isn't available to the external process.
   scoped_ptr<DictionaryValue> localized_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_