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

chrome/profile_import/profile_import_thread.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_PROFILE_IMPORT_PROFILE_IMPORT_THREAD_H_
 #define CHROME_PROFILE_IMPORT_PROFILE_IMPORT_THREAD_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 31 matching lines @@
   void NotifyEnded();
 
   // Bridging methods that move data back across the process boundary.
   void NotifyHistoryImportReady(const std::vector<history::URLRow> &rows,
                                 history::VisitSource visit_source);
   void NotifyHomePageImportReady(const GURL& home_page);
   void NotifyBookmarksImportReady(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
           const std::wstring& first_folder_name, int options);
   void NotifyFavIconsImportReady(
-      const std::vector<history::ImportedFavIconUsage>& fav_icons);
+      const std::vector<history::ImportedFavIconUsage>& favicons);
   void NotifyPasswordFormReady(const webkit_glue::PasswordForm& form);
   void NotifyKeywordsReady(const std::vector<TemplateURL*>& template_urls,
       int default_keyword_index, bool unique_on_host_and_path);
 
  private:
   // IPC messages
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
 
   // Creates the importer and launches it in a new thread. Import is run on
   // a separate thread so that this thread can receive messages from the
@@ skipping 30 matching lines @@
   // A mask of importer::ImportItems.
   uint16 items_to_import_;
 
   // Importer of the appropriate type (Firefox, Safari, IE, etc.)
   scoped_refptr<Importer> importer_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImportThread);
 };
 
 #endif  // CHROME_PROFILE_IMPORT_PROFILE_IMPORT_THREAD_H_