fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize

chrome/browser/fav_icon_helper.cc

 // 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.
 
 #include "chrome/browser/fav_icon_helper.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
@@ skipping 59 matching lines @@
 
 FaviconService* FavIconHelper::GetFaviconService() {
   return profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
 }
 
 void FavIconHelper::SetFavIcon(
     const GURL& url,
     const GURL& image_url,
     const SkBitmap& image) {
   const SkBitmap& sized_image =
-      (image.width() == kFavIconSize && image.height() == kFavIconSize)
+      (image.width() == kFaviconSize && image.height() == kFaviconSize)
       ? image : ConvertToFavIconSize(image);
 
   if (GetFaviconService() && ShouldSaveFavicon(url)) {
     std::vector<unsigned char> image_data;
     gfx::PNGCodec::EncodeBGRASkBitmap(sized_image, false, &image_data);
     GetFaviconService()->SetFavicon(url, image_url, image_data);
   }
 
   if (url == url_) {
     NavigationEntry* entry = GetEntry();
@@ skipping 129 matching lines @@
     DownloadFavIconOrAskHistory(entry);
   }
   // else we haven't got the icon url. When we get it we'll ask the
   // renderer to download the icon.
 }
 
 void FavIconHelper::DownloadFavIconOrAskHistory(NavigationEntry* entry) {
   DCHECK(entry);  // We should only get here if entry is valid.
   if (fav_icon_expired_) {
     // We have the mapping, but the favicon is out of date. Download it now.
-    ScheduleDownload(entry->url(), entry->favicon().url(), kFavIconSize, NULL);
+    ScheduleDownload(entry->url(), entry->favicon().url(), kFaviconSize, NULL);
   } else if (GetFaviconService()) {
     // We don't know the favicon, but we may have previously downloaded the
     // favicon for another page that shares the same favicon. Ask for the
     // favicon given the favicon URL.
     if (profile()->IsOffTheRecord()) {
       GetFaviconService()->GetFavicon(
           entry->favicon().url(),
           &cancelable_consumer_,
           NewCallback(this, &FavIconHelper::OnFavIconData));
     } else {
@@ skipping 26 matching lines @@
 
   if (know_favicon && data.get() && data->size()) {
     // There is a favicon, set it now. If expired we'll download the current
     // one again, but at least the user will get some icon instead of the
     // default and most likely the current one is fine anyway.
     UpdateFavIcon(entry, data);
   }
 
   if (!know_favicon || expired) {
     // We don't know the favicon, or it is out of date. Request the current one.
-    ScheduleDownload(entry->url(), entry->favicon().url(), kFavIconSize, NULL);
+    ScheduleDownload(entry->url(), entry->favicon().url(), kFaviconSize, NULL);
   }
 }
 
 int FavIconHelper::ScheduleDownload(const GURL& url,
                                     const GURL& image_url,
                                     int image_size,
                                     ImageDownloadCallback* callback) {
   const int download_id = tab_contents()->render_view_host()->DownloadFavIcon(
       image_url, image_size);
 
@@ skipping 19 matching lines @@
 }
 
 bool FavIconHelper::ShouldSaveFavicon(const GURL& url) {
   if (!profile()->IsOffTheRecord())
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
   BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
   return bookmark_model && bookmark_model->IsBookmarked(url);
 }