6 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc
index 36de7ad..59a785a 100644
--- a/chrome/browser/importer/external_process_importer_client.cc
+++ b/chrome/browser/importer/external_process_importer_client.cc
@@ -208,7 +208,7 @@ void ExternalProcessImporterClient::OnFavIconsImportGroup(
   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_);
+    bridge_->SetFavicons(fav_icons_);
 }
 
 void ExternalProcessImporterClient::OnPasswordFormImportReady(
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index d0208f2..d180ea1 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -318,7 +318,7 @@ void Firefox2Importer::ImportBookmarks() {
     STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
   }
   if (!favicons.empty()) {
-    bridge_->SetFavIcons(favicons);
+    bridge_->SetFavicons(favicons);
   }
 }
 
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 7017eab..8c5b656 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -301,7 +301,7 @@ void Firefox3Importer::ImportBookmarks() {
   if (!favicon_map.empty() && !cancelled()) {
     std::vector<history::ImportedFavIconUsage> favicons;
     LoadFavicons(db.get(), favicon_map, &favicons);
-    bridge_->SetFavIcons(favicons);
+    bridge_->SetFavicons(favicons);
   }
 }
 
diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc
index 692029d..c7afd1a 100644
--- a/chrome/browser/importer/importer_bridge.cc
+++ b/chrome/browser/importer/importer_bridge.cc
@@ -57,7 +57,7 @@ void InProcessImporterBridge::AddIE7PasswordInfo(
 }
 #endif  // OS_WIN
 
-void InProcessImporterBridge::SetFavIcons(
+void InProcessImporterBridge::SetFavicons(
     const std::vector<history::ImportedFavIconUsage>& fav_icons) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
@@ -151,7 +151,7 @@ void ExternalProcessImporterBridge::AddIE7PasswordInfo(
 }
 #endif
 
-void ExternalProcessImporterBridge::SetFavIcons(
+void ExternalProcessImporterBridge::SetFavicons(
     const std::vector<history::ImportedFavIconUsage>& fav_icons) {
   profile_import_thread_->NotifyFavIconsImportReady(fav_icons);
 }
diff --git a/chrome/browser/importer/importer_bridge.h b/chrome/browser/importer/importer_bridge.h
index 804d70b..335dcc9 100644
--- a/chrome/browser/importer/importer_bridge.h
+++ b/chrome/browser/importer/importer_bridge.h
@@ -33,7 +33,7 @@ class ImporterBridge : public base::RefCountedThreadSafe<ImporterBridge> {
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo password_info) = 0;
 #endif
 
-  virtual void SetFavIcons(
+  virtual void SetFavicons(
       const std::vector<history::ImportedFavIconUsage>& fav_icons) = 0;
   virtual void SetHistoryItems(const std::vector<history::URLRow> &rows,
                                history::VisitSource visit_source) = 0;
@@ -91,7 +91,7 @@ class InProcessImporterBridge : public ImporterBridge {
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo password_info);
 #endif
 
-  virtual void SetFavIcons(
+  virtual void SetFavicons(
       const std::vector<history::ImportedFavIconUsage>& fav_icons);
   virtual void SetHistoryItems(const std::vector<history::URLRow> &rows,
                                history::VisitSource visit_source);
@@ -137,7 +137,7 @@ class ExternalProcessImporterBridge : public ImporterBridge {
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo password_info);
 #endif
 
-  virtual void SetFavIcons(
+  virtual void SetFavicons(
       const std::vector<history::ImportedFavIconUsage>& fav_icons);
   virtual void SetHistoryItems(const std::vector<history::URLRow> &rows,
                                history::VisitSource visit_source);
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm
index e1046c6..fa5135f 100644
--- a/chrome/browser/importer/safari_importer.mm
+++ b/chrome/browser/importer/safari_importer.mm
@@ -120,7 +120,7 @@ void SafariImporter::ImportBookmarks() {
   if (!favicon_map.empty() && !cancelled()) {
     std::vector<history::ImportedFavIconUsage> favicons;
     LoadFaviconData(db.get(), favicon_map, &favicons);
-    bridge_->SetFavIcons(favicons);
+    bridge_->SetFavicons(favicons);
   }
 }