fav icon -> favicon. Pass 7: FavIconID -> FaviconID

chrome/browser/history/history_backend.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_HISTORY_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 #pragma once
 
 #include <string>
 #include <utility>
@@ skipping 439 matching lines @@
   // Only a single type can be given in icon_type when page_url is specified.
   void UpdateFavIconMappingAndFetchImpl(
       const GURL* page_url,
       const GURL& icon_url,
       scoped_refptr<GetFavIconRequest> request,
       int icon_type);
 
   // Sets the favicon url id for page_url to id. This will also broadcast
   // notifications as necessary.
   void SetFaviconMapping(const GURL& page_url,
-                         FavIconID id,
+                         FaviconID id,
                          IconType icon_type);
 
-  // Updates the FavIconID associated with the url of a page. If there is an
+  // Updates the FaviconID associated with the url of a page. If there is an
   // existing mapping between |page_url| and |id| this does nothing and returns
   // false. If the mapping needs to be added or updated, true is returned. If
   // there is an existing mapping but it does not map to |id|, then the |id| of
-  // the replaced FavIconID is set in |replaced_icon_id|.
+  // the replaced FaviconID is set in |replaced_icon_id|.
   bool AddOrUpdateIconMapping(const GURL& page_url,
-                              FavIconID id,
+                              FaviconID id,
                               IconType icon_type,
-                              FavIconID* replaced_icon_id);
+                              FaviconID* replaced_icon_id);
 
   // Generic stuff -------------------------------------------------------------
 
   // Processes the next scheduled HistoryDBTask, scheduling this method
   // to be invoked again if there are more tasks that need to run.
   void ProcessDBTaskImpl();
 
   // Release all tasks in history_db_tasks_ and clears it.
   void ReleaseDBTasks();
 
@@ skipping 116 matching lines @@
   // Publishes the history to all indexers which are registered to receive
   // history data from us. Can be NULL if there are no listeners.
   scoped_ptr<HistoryPublisher> history_publisher_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_