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

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 1622 matching lines @@
     const std::vector<ImportedFavIconUsage>& favicon_usage) {
   if (!db_.get() || !thumbnail_db_.get())
     return;
 
   Time now = Time::Now();
 
   // Track all URLs that had their favicons set or updated.
   std::set<GURL> favicons_changed;
 
   for (size_t i = 0; i < favicon_usage.size(); i++) {
-    FavIconID favicon_id = thumbnail_db_->GetFavIconIDForFavIconURL(
+    FaviconID favicon_id = thumbnail_db_->GetFaviconIDForFavIconURL(
         favicon_usage[i].favicon_url, history::FAV_ICON, NULL);
     if (!favicon_id) {
       // This favicon doesn't exist yet, so we create it using the given data.
       favicon_id = thumbnail_db_->AddFavIcon(favicon_usage[i].favicon_url,
                                              history::FAV_ICON);
       if (!favicon_id)
         continue;  // Unable to add the favicon.
       thumbnail_db_->SetFavicon(favicon_id,
           new RefCountedBytes(favicon_usage[i].png_data), now);
     }
@@ skipping 49 matching lines @@
 
   if (request->canceled())
     return;
 
   bool know_favicon = false;
   bool expired = true;
   scoped_refptr<RefCountedBytes> data;
 
   if (thumbnail_db_.get()) {
     IconType returned_icon_type;
-    const FavIconID favicon_id =
-        thumbnail_db_->GetFavIconIDForFavIconURL(
+    const FaviconID favicon_id =
+        thumbnail_db_->GetFaviconIDForFavIconURL(
             icon_url, icon_types, &returned_icon_type);
     if (favicon_id) {
       data = new RefCountedBytes;
       know_favicon = true;
       Time last_updated;
       if (thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data->data,
                                     NULL)) {
         expired = (Time::Now() - last_updated) >
             TimeDelta::FromDays(kFavIconRefetchDays);
       }
@@ skipping 49 matching lines @@
 
 void HistoryBackend::SetFavicon(
     const GURL& page_url,
     const GURL& icon_url,
     scoped_refptr<RefCountedMemory> data,
     IconType icon_type) {
   DCHECK(data.get());
   if (!thumbnail_db_.get() || !db_.get())
     return;
 
-  FavIconID id = thumbnail_db_->GetFavIconIDForFavIconURL(
+  FaviconID id = thumbnail_db_->GetFaviconIDForFavIconURL(
       icon_url, icon_type, NULL);
   if (!id)
     id = thumbnail_db_->AddFavIcon(icon_url, icon_type);
 
   // Set the image data.
   thumbnail_db_->SetFavicon(id, data, Time::Now());
 
   SetFaviconMapping(page_url, id, icon_type);
 }
 
 void HistoryBackend::SetFaviconMapping(const GURL& page_url,
-                                       FavIconID id,
+                                       FaviconID id,
                                        IconType icon_type) {
   if (!thumbnail_db_.get())
     return;
 
   // Find all the pages whose favicons we should set, we want to set it for
   // all the pages in the redirect chain if it redirected.
   history::RedirectList dummy_list;
   history::RedirectList* redirects;
   RedirectCache::iterator iter = recent_redirects_.Get(page_url);
   if (iter != recent_redirects_.end()) {
     redirects = &iter->second;
 
     // This redirect chain should have the destination URL as the last item.
     DCHECK(!redirects->empty());
     DCHECK(redirects->back() == page_url);
   } else {
     // No redirect chain stored, make up one containing the URL we want to we
     // can use the same logic below.
     dummy_list.push_back(page_url);
     redirects = &dummy_list;
   }
 
   std::set<GURL> favicons_changed;
 
   // Save page <-> favicon association.
   for (history::RedirectList::const_iterator i(redirects->begin());
        i != redirects->end(); ++i) {
-    FavIconID replaced_id;
+    FaviconID replaced_id;
     if (AddOrUpdateIconMapping(*i, id, icon_type, &replaced_id)) {
       // The page's favicon ID changed. This means that the one we just
       // changed from could have been orphaned, and we need to re-check it.
       // This is not super fast, but this case will get triggered rarely,
       // since normally a page will always map to the same favicon ID. It
       // will mostly happen for favicons we import.
       if (replaced_id && !thumbnail_db_->HasMappingFor(replaced_id))
         thumbnail_db_->DeleteFavIcon(replaced_id);
 
       favicons_changed.insert(*i);
     }
   }
 
   // Send the notification about the changed favicons.
   FavIconChangeDetails* changed_details = new FavIconChangeDetails;
   changed_details->urls.swap(favicons_changed);
   BroadcastNotifications(NotificationType::FAVICON_CHANGED, changed_details);
 
   ScheduleCommit();
 }
 
 bool HistoryBackend::AddOrUpdateIconMapping(const GURL& page_url,
-                                            FavIconID id,
+                                            FaviconID id,
                                             IconType icon_type,
-                                            FavIconID* replaced_icon) {
+                                            FaviconID* replaced_icon) {
   *replaced_icon = 0;
   std::vector<IconMapping> icon_mappings;
   if (!thumbnail_db_->GetIconMappingsForPageURL(page_url, &icon_mappings)) {
     // There is no mapping add it directly.
     thumbnail_db_->AddIconMapping(page_url, id);
     return true;
   }
   // Iterate all matched icon mappings,
   // a. If the given icon id and matched icon id are same, return.
   // b. If the given icon type and matched icon type are same, but icon id
@@ skipping 307 matching lines @@
 
   // Create the duplicate favicon table, this is where the favicons we want
   // to keep will be stored.
   if (!thumbnail_db_->InitTemporaryFavIconsTable())
     return false;
 
   if (!thumbnail_db_->InitTemporaryIconMappingTable())
     return false;
 
   // This maps existing favicon IDs to the ones in the temporary table.
-  typedef std::map<FavIconID, FavIconID> FavIconMap;
+  typedef std::map<FaviconID, FaviconID> FavIconMap;
   FavIconMap copied_favicons;
 
   // Copy all unique favicons to the temporary table, and update all the
   // URLs to have the new IDs.
   for (std::vector<URLRow>::iterator i = kept_urls->begin();
        i != kept_urls->end(); ++i) {
     std::vector<IconMapping> icon_mappings;
     if (!thumbnail_db_->GetIconMappingsForPageURL(i->url(), &icon_mappings))
       continue;
 
     for (std::vector<IconMapping>::iterator m = icon_mappings.begin();
          m != icon_mappings.end(); ++m) {
-      FavIconID old_id = m->icon_id;
-      FavIconID new_id;
+      FaviconID old_id = m->icon_id;
+      FaviconID new_id;
       FavIconMap::const_iterator found = copied_favicons.find(old_id);
       if (found == copied_favicons.end()) {
         new_id = thumbnail_db_->CopyToTemporaryFavIconTable(old_id);
         copied_favicons[old_id] = new_id;
       } else {
         // We already encountered a URL that used this favicon, use the ID we
         // previously got.
         new_id = found->second;
       }
       // Add Icon mapping, and we don't care wheteher it suceeded or not.
@@ skipping 53 matching lines @@
   return true;
 }
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history