fav icon -> favicon. Pass 5: fav_icon -> favicon

chrome/browser/ui/search_engines/template_url_table_model.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/ui/search_engines/template_url_table_model.h"
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 34 matching lines @@
     }
   }
 
   const TemplateURL& template_url() {
     return template_url_;
   }
 
   SkBitmap GetIcon() {
     if (load_state_ == NOT_LOADED)
       LoadFavIcon();
-    if (!fav_icon_.isNull())
-      return fav_icon_;
+    if (!favicon_.isNull())
+      return favicon_;
     return *default_icon;
   }
 
   // Resets internal status so that the next time the icon is asked for its
   // fetched again. This should be invoked if the url is modified.
   void ResetIcon() {
     load_state_ = NOT_LOADED;
-    fav_icon_ = SkBitmap();
+    favicon_ = SkBitmap();
   }
 
  private:
   // State of the favicon.
   enum LoadState {
     NOT_LOADED,
     LOADING,
     LOADED
   };
 
   void LoadFavIcon() {
     load_state_ = LOADED;
     FaviconService* favicon_service =
         model_->template_url_model()->profile()->GetFaviconService(
             Profile::EXPLICIT_ACCESS);
     if (!favicon_service)
       return;
-    GURL fav_icon_url = template_url().GetFavIconURL();
-    if (!fav_icon_url.is_valid()) {
+    GURL favicon_url = template_url().GetFavIconURL();
+    if (!favicon_url.is_valid()) {
       // The favicon url isn't always set. Guess at one here.
       if (template_url_.url() && template_url_.url()->IsValid()) {
         GURL url = GURL(template_url_.url()->url());
         if (url.is_valid())
-          fav_icon_url = TemplateURL::GenerateFaviconURL(url);
+          favicon_url = TemplateURL::GenerateFaviconURL(url);
       }
-      if (!fav_icon_url.is_valid())
+      if (!favicon_url.is_valid())
         return;
     }
     load_state_ = LOADING;
-    favicon_service->GetFavicon(fav_icon_url,
+    favicon_service->GetFavicon(favicon_url,
                    &request_consumer_,
                    NewCallback(this, &ModelEntry::OnFavIconDataAvailable));
   }
 
   void OnFavIconDataAvailable(
       FaviconService::Handle handle,
       bool know_favicon,
       scoped_refptr<RefCountedMemory> data,
       bool expired,
       GURL icon_url) {
     load_state_ = LOADED;
     if (know_favicon && data.get() &&
-        gfx::PNGCodec::Decode(data->front(), data->size(), &fav_icon_)) {
+        gfx::PNGCodec::Decode(data->front(), data->size(), &favicon_)) {
       model_->FavIconAvailable(this);
     }
   }
 
   const TemplateURL& template_url_;
-  SkBitmap fav_icon_;
+  SkBitmap favicon_;
   LoadState load_state_;
   TemplateURLTableModel* model_;
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ModelEntry);
 };
 
 // TemplateURLTableModel -----------------------------------------
 
 TemplateURLTableModel::TemplateURLTableModel(
@@ skipping 248 matching lines @@
 void TemplateURLTableModel::FavIconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLModelChanged() {
   Reload();
 }