From 16be5c3ac774c21bfa88ec0582137d745f07572d Mon Sep 17 00:00:00 2001
From: "avi@chromium.org"
 <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 15 Mar 2011 17:52:03 +0000
Subject: fav icon -> favicon. Pass 5: fav_icon -> favicon

BUG=76073
TEST=none; no visible change

Review URL: http://codereview.chromium.org/6693021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78230 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/profile_import/profile_import_thread.cc | 14 +++++++-------
 chrome/profile_import/profile_import_thread.h  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'chrome/profile_import')

diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc
index 14c66f6..a7dd12f 100644
--- a/chrome/profile_import/profile_import_thread.cc
+++ b/chrome/profile_import/profile_import_thread.cc
@@ -157,20 +157,20 @@ void ProfileImportThread::NotifyBookmarksImportReady(
 }
 
 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));
   }
 }
 
diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h
index 3fd1fd8..c3fd7b0 100644
--- a/chrome/profile_import/profile_import_thread.h
+++ b/chrome/profile_import/profile_import_thread.h
@@ -49,7 +49,7 @@ class ProfileImportThread : public ChildThread {
       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);
-- 
cgit v1.1