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

chrome/browser/custom_home_pages_table_model.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_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_
 #define CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 51 matching lines @@
   void LoadTitleAndFavIcon(Entry* entry);
 
   // Callback from history service. Updates the title of the Entry whose
   // |title_handle| matches |handle| and notifies the observer of the change.
   void OnGotTitle(HistoryService::Handle handle,
                   bool found_url,
                   const history::URLRow* row,
                   history::VisitVector* visits);
 
   // Callback from history service. Updates the icon of the Entry whose
-  // |fav_icon_handle| matches |handle| and notifies the observer of the change.
+  // |favicon_handle| matches |handle| and notifies the observer of the change.
   void OnGotFavIcon(FaviconService::Handle handle,
-                    bool know_fav_icon,
+                    bool know_favicon,
                     scoped_refptr<RefCountedMemory> image_data,
                     bool is_expired,
                     GURL icon_url);
 
   // Returns the entry whose |member| matches |handle| and sets |entry_index| to
   // the index of the entry.
   Entry* GetEntryByLoadHandle(CancelableRequestProvider::Handle Entry::* member,
                               CancelableRequestProvider::Handle handle,
                               int* entry_index);
 
-  // Returns the entry whose |fav_icon_handle| matches |handle| and sets
+  // Returns the entry whose |favicon_handle| matches |handle| and sets
   // |entry_index| to the index of the entry.
   Entry* GetEntryByFavIconHandle(FaviconService::Handle handle,
                                  int* entry_index);
 
   // Returns the URL for a particular row, formatted for display to the user.
   string16 FormattedURL(int row) const;
 
   // Set of entries we're showing.
   std::vector<Entry> entries_;
 
   // Default icon to show when one can't be found for the URL.
   SkBitmap* default_favicon_;
 
   // Profile used to load titles and icons.
   Profile* profile_;
 
   ui::TableModelObserver* observer_;
 
   // Used in loading titles and favicons.
   CancelableRequestConsumer query_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomHomePagesTableModel);
 };
 
 #endif  // CHROME_BROWSER_CUSTOM_HOME_PAGES_TABLE_MODEL_H_