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

chrome/browser/importer/external_process_importer_client.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/external_process_importer_client.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "content/browser/browser_thread.h"
 
 ExternalProcessImporterClient::ExternalProcessImporterClient(
     ExternalProcessImporterHost* importer_host,
     const importer::ProfileInfo& profile_info,
     uint16 items,
     InProcessImporterBridge* bridge,
     bool import_to_bookmark_bar)
     : bookmarks_options_(0),
       total_bookmarks_count_(0),
       total_history_rows_count_(0),
-      total_fav_icons_count_(0),
+      total_favicons_count_(0),
       process_importer_host_(importer_host),
       profile_import_process_host_(NULL),
       profile_info_(profile_info),
       items_(items),
       import_to_bookmark_bar_(import_to_bookmark_bar),
       bridge_(bridge),
       cancelled_(false) {
   bridge_->AddRef();
   process_importer_host_->NotifyImportStarted();
 }
@@ skipping 150 matching lines @@
   // total_bookmarks_count_:
   bookmarks_.insert(bookmarks_.end(), bookmarks_group.begin(),
                     bookmarks_group.end());
   if (bookmarks_.size() == total_bookmarks_count_) {
     bridge_->AddBookmarkEntries(bookmarks_, bookmarks_first_folder_name_,
                                 bookmarks_options_);
   }
 }
 
 void ExternalProcessImporterClient::OnFavIconsImportStart(
-    size_t total_fav_icons_count) {
+    size_t total_favicons_count) {
   if (cancelled_)
     return;
 
-  total_fav_icons_count_ = total_fav_icons_count;
-  fav_icons_.reserve(total_fav_icons_count);
+  total_favicons_count_ = total_favicons_count;
+  favicons_.reserve(total_favicons_count);
 }
 
 void ExternalProcessImporterClient::OnFavIconsImportGroup(
-    const std::vector<history::ImportedFavIconUsage>& fav_icons_group) {
+    const std::vector<history::ImportedFavIconUsage>& favicons_group) {
   if (cancelled_)
     return;
 
-  fav_icons_.insert(fav_icons_.end(), fav_icons_group.begin(),
-                    fav_icons_group.end());
-  if (fav_icons_.size() == total_fav_icons_count_)
-    bridge_->SetFavicons(fav_icons_);
+  favicons_.insert(favicons_.end(), favicons_group.begin(),
+                    favicons_group.end());
+  if (favicons_.size() == total_favicons_count_)
+    bridge_->SetFavicons(favicons_);
 }
 
 void ExternalProcessImporterClient::OnPasswordFormImportReady(
     const webkit_glue::PasswordForm& form) {
   if (cancelled_)
     return;
 
   bridge_->SetPasswordForm(form);
 }
 
 void ExternalProcessImporterClient::OnKeywordsImportReady(
     const std::vector<TemplateURL>& template_urls,
         int default_keyword_index, bool unique_on_host_and_path) {
   if (cancelled_)
     return;
 
   std::vector<TemplateURL*> template_url_vec;
   template_url_vec.reserve(template_urls.size());
   std::vector<TemplateURL>::const_iterator iter;
   for (iter = template_urls.begin();
        iter != template_urls.end();
        ++iter) {
     template_url_vec.push_back(new TemplateURL(*iter));
   }
   bridge_->SetKeywords(template_url_vec, default_keyword_index,
                        unique_on_host_and_path);
 }