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

chrome/browser/search_engines/template_url.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/search_engines/template_url.h"
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 636 matching lines @@
 }
 
 bool TemplateURL::ShowInDefaultList() const {
   return show_in_default_list() && url() && url()->SupportsReplacement();
 }
 
 void TemplateURL::SetFavIconURL(const GURL& url) {
   for (std::vector<ImageRef>::iterator i = image_refs_.begin();
        i != image_refs_.end(); ++i) {
     if (i->type == "image/x-icon" &&
-        i->width == kFavIconSize && i->height == kFavIconSize) {
+        i->width == kFaviconSize && i->height == kFaviconSize) {
       if (!url.is_valid())
         image_refs_.erase(i);
       else
         i->url = url;
       return;
     }
   }
   // Don't have one yet, add it.
   if (url.is_valid()) {
     add_image_ref(
-        TemplateURL::ImageRef("image/x-icon", kFavIconSize,
-                              kFavIconSize, url));
+        TemplateURL::ImageRef("image/x-icon", kFaviconSize,
+                              kFaviconSize, url));
   }
 }
 
 GURL TemplateURL::GetFavIconURL() const {
   for (std::vector<ImageRef>::const_iterator i = image_refs_.begin();
        i != image_refs_.end(); ++i) {
     if ((i->type == "image/x-icon" || i->type == "image/vnd.microsoft.icon")
-        && i->width == kFavIconSize && i->height == kFavIconSize) {
+        && i->width == kFaviconSize && i->height == kFaviconSize) {
       return i->url;
     }
   }
   return GURL();
 }
 
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
   if (autogenerate_keyword_) {
     keyword_.clear();
     keyword_generated_ = false;
   }
 }
 
 std::string TemplateURL::GetExtensionId() const {
   DCHECK(IsExtensionKeyword());
   return GURL(url_.url()).host();
 }
 
 bool TemplateURL::IsExtensionKeyword() const {
   return GURL(url_.url()).SchemeIs(chrome::kExtensionScheme);
 }