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

chrome/browser/ui/touch/tabs/touch_tab.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/touch/tabs/touch_tab.h"
 
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 175 matching lines @@
         IDR_THROBBER_WAITING : IDR_THROBBER));
     int image_size = frames.height();
     int image_offset = loading_animation_frame() * image_size;
     canvas->DrawBitmapInt(frames, image_offset, 0, image_size, image_size, x, y,
                           kTouchFaviconSize, kTouchFaviconSize, false);
   } else {
     canvas->Save();
     canvas->ClipRectInt(0, 0, width(), height());
     if (should_display_crashed_favicon()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      SkBitmap crashed_fav_icon(*rb.GetBitmapNamed(IDR_SAD_FAVICON));
-      canvas->DrawBitmapInt(crashed_fav_icon, 0, 0, crashed_fav_icon.width(),
-          crashed_fav_icon.height(), x, y + fav_icon_hiding_offset(),
+      SkBitmap crashed_favicon(*rb.GetBitmapNamed(IDR_SAD_FAVICON));
+      canvas->DrawBitmapInt(crashed_favicon, 0, 0, crashed_favicon.width(),
+          crashed_favicon.height(), x, y + favicon_hiding_offset(),
           kTouchFaviconSize, kTouchFaviconSize, true);
     } else {
       if (!data().favicon.isNull()) {
         canvas->DrawBitmapInt(data().favicon, 0, 0,
                               data().favicon.width(), data().favicon.height(),
-                              x, y + fav_icon_hiding_offset(),
+                              x, y + favicon_hiding_offset(),
                               kTouchFaviconSize, kTouchFaviconSize, true);
       }
     }
     canvas->Restore();
   }
 }
 
 // static
 void TouchTab::InitTabResources() {
   static bool initialized = false;
@@ skipping 20 matching lines @@
   tab_active.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active.l_width = tab_active.image_l->width();
   tab_active.r_width = tab_active.image_r->width();
 
   tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
 }