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

chrome/browser/importer/importer.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/importer/importer.h"
 
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 12 matching lines @@
 }
 
 Importer::~Importer() {
 }
 
 // static
 bool Importer::ReencodeFavicon(const unsigned char* src_data,
                                size_t src_len,
                                std::vector<unsigned char>* png_data) {
   // Decode the favicon using WebKit's image decoder.
-  webkit_glue::ImageDecoder decoder(gfx::Size(kFavIconSize, kFavIconSize));
+  webkit_glue::ImageDecoder decoder(gfx::Size(kFaviconSize, kFaviconSize));
   SkBitmap decoded = decoder.Decode(src_data, src_len);
   if (decoded.empty())
     return false;  // Unable to decode.
 
-  if (decoded.width() != kFavIconSize || decoded.height() != kFavIconSize) {
+  if (decoded.width() != kFaviconSize || decoded.height() != kFaviconSize) {
     // The bitmap is not the correct size, re-sample.
     int new_width = decoded.width();
     int new_height = decoded.height();
     calc_favicon_target_size(&new_width, &new_height);
     decoded = skia::ImageOperations::Resize(
         decoded, skia::ImageOperations::RESIZE_LANCZOS3, new_width, new_height);
   }
 
   // Encode our bitmap as a PNG.
   gfx::PNGCodec::EncodeBGRASkBitmap(decoded, false, png_data);
   return true;
 }