fav icon -> favicon. Pass 10: bookmarks

BUG=76073
TEST=none; no visible change

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78289 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 43 insertions, 43 deletions

diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 4007243..6149a41 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -298,7 +298,7 @@ class Browser : public TabHandlerDelegate,
   gfx::Rect GetSavedWindowBounds() const;
   bool GetSavedMaximizedState() const;
 
-  // Gets the FavIcon of the page in the selected tab.
+  // Gets the Favicon of the page in the selected tab.
   SkBitmap GetCurrentPageIcon() const;
 
   // Gets the title of the window based on the selected tab's title.
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
index 811c450..849d85cc 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
@@ -41,7 +41,7 @@ class BookmarkBarBridge : public BookmarkModelObserver {
                                    const BookmarkNode* node);
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node);
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node);
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
index 54f5e81..a00e7cb 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
@@ -62,9 +62,9 @@ void BookmarkBarBridge::BookmarkNodeChanged(BookmarkModel* model,
   [controller_ nodeChanged:model node:node];
 }
 
-void BookmarkBarBridge::BookmarkNodeFavIconLoaded(BookmarkModel* model,
+void BookmarkBarBridge::BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                                   const BookmarkNode* node) {
-  [controller_ nodeFavIconLoaded:model node:node];
+  [controller_ nodeFaviconLoaded:model node:node];
 }
 
 void BookmarkBarBridge::BookmarkNodeChildrenReordered(
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
index 067d327..646af0e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
@@ -67,7 +67,7 @@ typedef std::pair<GURL,WindowOpenDisposition> OpenInfo;
   [callbacks_ addObject:[NSNumber numberWithInt:4]];
 }
 
-- (void)nodeFavIconLoaded:(BookmarkModel*)model
+- (void)nodeFaviconLoaded:(BookmarkModel*)model
                      node:(const BookmarkNode*)node {
   [callbacks_ addObject:[NSNumber numberWithInt:5]];
 }
@@ -121,7 +121,7 @@ TEST_F(BookmarkBarBridgeTest, TestRedirect) {
   bridge->BookmarkNodeMoved(NULL, NULL, 0, NULL, 0);
   bridge->BookmarkNodeAdded(NULL, NULL, 0);
   bridge->BookmarkNodeChanged(NULL, NULL);
-  bridge->BookmarkNodeFavIconLoaded(NULL, NULL);
+  bridge->BookmarkNodeFaviconLoaded(NULL, NULL);
   bridge->BookmarkNodeChildrenReordered(NULL, NULL);
   bridge->BookmarkNodeRemoved(NULL, NULL, 0, NULL);
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
index 67a9bf4..f17ee23 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
@@ -360,7 +360,7 @@ willAnimateFromState:(bookmarks::VisualState)oldState
         newParent:(const BookmarkNode*)newParent newIndex:(int)newIndex;
 - (void)nodeRemoved:(BookmarkModel*)model
              parent:(const BookmarkNode*)oldParent index:(int)index;
-- (void)nodeFavIconLoaded:(BookmarkModel*)model
+- (void)nodeFaviconLoaded:(BookmarkModel*)model
                      node:(const BookmarkNode*)node;
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(const BookmarkNode*)node;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 0b9202d..19bd58d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -1911,7 +1911,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
 // this looks bad I may need to change widthForBookmarkButtonCell to
 // add space for an image even if not there on the assumption that
 // favicons will eventually load.
-- (void)nodeFavIconLoaded:(BookmarkModel*)model
+- (void)nodeFaviconLoaded:(BookmarkModel*)model
                      node:(const BookmarkNode*)node {
   for (BookmarkButton* button in buttons_.get()) {
     const BookmarkNode* cellnode = [button bookmarkNode];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 0033e0b..5d20731 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -927,7 +927,7 @@ TEST_F(BookmarkBarControllerTest, DeleteBookmark) {
   EXPECT_EQ(parent->GetChild(1)->GetURL(), GURL(urls[2]));
 }
 
-// TODO(jrg): write a test to confirm that nodeFavIconLoaded calls
+// TODO(jrg): write a test to confirm that nodeFaviconLoaded calls
 // checkForBookmarkButtonGrowth:.
 
 TEST_F(BookmarkBarControllerTest, Cell) {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index 6d39cf4..52308af 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -126,7 +126,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
       [controller_ modelChangedPreserveSelection:YES];
   }
 
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node) {
     // I care nothing for these 'favicons': I only show folders.
   }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
index 37a4a2c..51aadb7 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
@@ -55,7 +55,7 @@ class BookmarkMenuBridge : public BookmarkModelObserver {
                                    const BookmarkNode* node);
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node);
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node);
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 06b8903..a5bfc5d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -115,7 +115,7 @@ void BookmarkMenuBridge::BookmarkNodeChanged(BookmarkModel* model,
     ConfigureMenuItem(node, item, true);
 }
 
-void BookmarkMenuBridge::BookmarkNodeFavIconLoaded(BookmarkModel* model,
+void BookmarkMenuBridge::BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                                    const BookmarkNode* node) {
   NSMenuItem* item = MenuItemForNode(node);
   if (item)
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index fea87f1..13c92d7 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -355,7 +355,7 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToOther) {
   EXPECT_NSEQ(@"http://foo/", [[[other submenu] itemAtIndex:0] title]);
 }
 
-TEST_F(BookmarkMenuBridgeTest, TestFavIconLoading) {
+TEST_F(BookmarkMenuBridgeTest, TestFaviconLoading) {
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
@@ -369,7 +369,7 @@ TEST_F(BookmarkMenuBridgeTest, TestFavIconLoading) {
   NSMenuItem* item = [menu itemWithTitle:@"Test Item"];
   EXPECT_TRUE([item image]);
   [item setImage:nil];
-  bridge_->BookmarkNodeFavIconLoaded(model, node);
+  bridge_->BookmarkNodeFaviconLoaded(model, node);
   EXPECT_TRUE([item image]);
 }
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
index 9061132..dcaac34 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
@@ -66,7 +66,7 @@ class BookmarkModelObserverForCocoa : public BookmarkModelObserver {
                                  const BookmarkNode* parent,
                                  int index) {
   }
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node) {
   }
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index dd98aab..f1c263f 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -1071,10 +1071,10 @@ void AnimateCALayerOpacityFromTo(
   // Either we don't have a valid favicon or there was some issue converting
   // it from an SkBitmap. Either way, just show the default.
   if (!nsFavicon) {
-    NSImage* defaultFavIcon =
+    NSImage* defaultFavicon =
         ResourceBundle::GetSharedInstance().GetNativeImageNamed(
             IDR_DEFAULT_FAVICON);
-    nsFavicon = defaultFavIcon;
+    nsFavicon = defaultFavicon;
   }
   base::mac::ScopedCFTypeRef<CGImageRef> favicon(
       base::mac::CopyNSImageToCGImage(nsFavicon));
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
index 69ffd41..5817cc3 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h
@@ -132,7 +132,7 @@ class ToolbarModel;
   scoped_nsobject<NSMutableArray> permanentSubviews_;
 
   // The default favicon, so we can use one copy for all buttons.
-  scoped_nsobject<NSImage> defaultFavIcon_;
+  scoped_nsobject<NSImage> defaultFavicon_;
 
   // The amount by which to indent the tabs on the left (to make room for the
   // red/yellow/green buttons).
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 5b47e31..2988682 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -127,7 +127,7 @@ private:
 - (void)addSubviewToPermanentList:(NSView*)aView;
 - (void)regenerateSubviewList;
 - (NSInteger)indexForContentsView:(NSView*)view;
-- (void)updateFavIconForContents:(TabContents*)contents
+- (void)updateFaviconForContents:(TabContents*)contents
                          atIndex:(NSInteger)modelIndex;
 - (void)layoutTabsWithAnimation:(BOOL)animate
              regenerateSubviews:(BOOL)doUpdate;
@@ -304,7 +304,7 @@ private:
     permanentSubviews_.reset([[NSMutableArray alloc] init]);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    defaultFavIcon_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
+    defaultFavicon_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
 
     [self setIndentForControls:[[self class] defaultIndentForControls]];
 
@@ -1021,7 +1021,7 @@ private:
   // dragging a tab out into a new window, we have to put the tab's favicon
   // into the right state up front as we won't be told to do it from anywhere
   // else.
-  [self updateFavIconForContents:contents->tab_contents() atIndex:modelIndex];
+  [self updateFaviconForContents:contents->tab_contents() atIndex:modelIndex];
 
   // Send a broadcast that the number of tabs have changed.
   [[NSNotificationCenter defaultCenter]
@@ -1231,7 +1231,7 @@ private:
   // Either we don't have a valid favicon or there was some issue converting it
   // from an SkBitmap. Either way, just show the default.
   if (!image)
-    image = defaultFavIcon_.get();
+    image = defaultFavicon_.get();
   NSRect frame = NSMakeRect(0, 0, kIconWidthAndHeight, kIconWidthAndHeight);
   NSImageView* view = [[[NSImageView alloc] initWithFrame:frame] autorelease];
   [view setImage:image];
@@ -1240,7 +1240,7 @@ private:
 
 // Updates the current loading state, replacing the icon view with a favicon,
 // a throbber, the default icon, or nothing at all.
-- (void)updateFavIconForContents:(TabContents*)contents
+- (void)updateFaviconForContents:(TabContents*)contents
                          atIndex:(NSInteger)modelIndex {
   if (!contents)
     return;
@@ -1332,7 +1332,7 @@ private:
   if (change != TabStripModelObserver::LOADING_ONLY)
     [self setTabTitle:tabController withContents:contents->tab_contents()];
 
-  [self updateFavIconForContents:contents->tab_contents() atIndex:modelIndex];
+  [self updateFaviconForContents:contents->tab_contents() atIndex:modelIndex];
 
   TabContentsController* updatedController =
       [tabContentsArray_ objectAtIndex:index];
@@ -1383,7 +1383,7 @@ private:
   [tabController setMini:tabStripModel_->IsMiniTab(modelIndex)];
   [tabController setPinned:tabStripModel_->IsTabPinned(modelIndex)];
   [tabController setApp:tabStripModel_->IsAppTab(modelIndex)];
-  [self updateFavIconForContents:contents->tab_contents() atIndex:modelIndex];
+  [self updateFaviconForContents:contents->tab_contents() atIndex:modelIndex];
   // If the tab is being restored and it's pinned, the mini state is set after
   // the tab has already been rendered, so re-layout the tabstrip. In all other
   // cases, the state is set before the tab is rendered so this isn't needed.
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index a4e2fd2..173faf2 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -487,7 +487,7 @@ void BookmarkBarGtk::BookmarkNodeChanged(BookmarkModel* model,
   SetChevronState();
 }
 
-void BookmarkBarGtk::BookmarkNodeFavIconLoaded(BookmarkModel* model,
+void BookmarkBarGtk::BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                                const BookmarkNode* node) {
   BookmarkNodeChanged(model, node);
 }
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
index 4476757..cbd7b8c 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
@@ -226,7 +226,7 @@ class BookmarkBarGtk : public ui::AnimationDelegate,
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node);
   // Invoked when a favicon has finished loading.
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node);
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node);
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
index c995b1b..041b83e 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
@@ -78,7 +78,7 @@ class BookmarkEditorGtk : public BookmarkEditor,
                                    const BookmarkNode* node) {}
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node);
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node) {}
 
   // Resets the model of the tree and updates the various buttons appropriately.
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
index 2a3c869..5af40b2 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
@@ -113,7 +113,7 @@ void BookmarkMenuController::BookmarkModelChanged() {
   gtk_menu_popdown(GTK_MENU(menu_));
 }
 
-void BookmarkMenuController::BookmarkNodeFavIconLoaded(
+void BookmarkMenuController::BookmarkNodeFaviconLoaded(
     BookmarkModel* model, const BookmarkNode* node) {
   std::map<const BookmarkNode*, GtkWidget*>::iterator it =
       node_to_menu_widget_map_.find(node);
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
index 0b07a49..509801d 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
@@ -50,7 +50,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
 
   // Overridden from BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged();
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node);
 
   // Overridden from BookmarkContextMenuController::Delegate:
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index cdcccff..31039c5 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -51,7 +51,7 @@ class ModelEntry {
 
   SkBitmap GetIcon() {
     if (load_state_ == NOT_LOADED)
-      LoadFavIcon();
+      LoadFavicon();
     if (!favicon_.isNull())
       return favicon_;
     return *default_icon;
@@ -72,7 +72,7 @@ class ModelEntry {
     LOADED
   };
 
-  void LoadFavIcon() {
+  void LoadFavicon() {
     load_state_ = LOADED;
     FaviconService* favicon_service =
         model_->template_url_model()->profile()->GetFaviconService(
@@ -93,10 +93,10 @@ class ModelEntry {
     load_state_ = LOADING;
     favicon_service->GetFavicon(favicon_url,
                    &request_consumer_,
-                   NewCallback(this, &ModelEntry::OnFavIconDataAvailable));
+                   NewCallback(this, &ModelEntry::OnFaviconDataAvailable));
   }
 
-  void OnFavIconDataAvailable(
+  void OnFaviconDataAvailable(
       FaviconService::Handle handle,
       bool know_favicon,
       scoped_refptr<RefCountedMemory> data,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 69a0d82..9ed449d 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1065,7 +1065,7 @@ void BookmarkBarView::BookmarkNodeChildrenReordered(BookmarkModel* model,
   SchedulePaint();
 }
 
-void BookmarkBarView::BookmarkNodeFavIconLoaded(BookmarkModel* model,
+void BookmarkBarView::BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                                 const BookmarkNode* node) {
   BookmarkNodeChangedImpl(model, node);
 }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index 8c49420..98c7899 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -350,7 +350,7 @@ class BookmarkBarView : public DetachableToolbarView,
   // Invoked when the favicon is available. If the node is a child of the
   // root node, the appropriate button is updated. If a menu is showing, the
   // call is forwarded to the menu to allow for it to update the icon.
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node);
 
   // DragController method. Determines the node representing sender and invokes
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index 861805f..5fede0a 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -154,7 +154,7 @@ class BookmarkEditorView : public BookmarkEditor,
                                    const BookmarkNode* node) {}
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node);
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node) {}
 
   // Resets the model of the tree and updates the various buttons appropriately.
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
index 3a6effd..8243786 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
@@ -282,7 +282,7 @@ void BookmarkMenuController::BookmarkModelChanged() {
   menu_->Cancel();
 }
 
-void BookmarkMenuController::BookmarkNodeFavIconLoaded(
+void BookmarkMenuController::BookmarkNodeFaviconLoaded(
     BookmarkModel* model, const BookmarkNode* node) {
   NodeToMenuIDMap::iterator menu_pair = node_to_menu_id_map_.find(node);
   if (menu_pair == node_to_menu_id_map_.end())
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
index 25d07d2..ba3495d 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
@@ -119,7 +119,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
 
   // BookmarkModelObserver methods.
   virtual void BookmarkModelChanged();
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+  virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
                                          const BookmarkNode* node);
 
   // BookmarkContextMenu::Observer methods.
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 8461a41..f70ab08 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -34,12 +34,12 @@ void FavIconSource::StartDataRequest(const std::string& path,
       handle = favicon_service->GetFavicon(
           GURL(path.substr(8)),
           &cancelable_consumer_,
-          NewCallback(this, &FavIconSource::OnFavIconDataAvailable));
+          NewCallback(this, &FavIconSource::OnFaviconDataAvailable));
     } else {
       handle = favicon_service->GetFaviconForURL(
           GURL(path),
           &cancelable_consumer_,
-          NewCallback(this, &FavIconSource::OnFavIconDataAvailable));
+          NewCallback(this, &FavIconSource::OnFaviconDataAvailable));
     }
     // Attach the ChromeURLDataManager request ID to the history request.
     cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
@@ -60,7 +60,7 @@ bool FavIconSource::ShouldReplaceExistingSource() const {
   return false;
 }
 
-void FavIconSource::OnFavIconDataAvailable(
+void FavIconSource::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
     bool know_favicon,
     scoped_refptr<RefCountedMemory> data,
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h
index 4816ec5..b84982b 100644
--- a/chrome/browser/ui/webui/favicon_source.h
+++ b/chrome/browser/ui/webui/favicon_source.h
@@ -34,7 +34,7 @@ class FavIconSource : public ChromeURLDataManager::DataSource {
 
  private:
   // Called when favicon data is available from the history backend.
-  void OnFavIconDataAvailable(FaviconService::Handle request_handle,
+  void OnFaviconDataAvailable(FaviconService::Handle request_handle,
                               bool know_favicon,
                               scoped_refptr<RefCountedMemory> data,
                               bool expired,