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

chrome/browser/ui/touch/tabs/touch_tab.cc

Index: chrome/browser/ui/touch/tabs/touch_tab.cc
diff --git a/chrome/browser/ui/touch/tabs/touch_tab.cc b/chrome/browser/ui/touch/tabs/touch_tab.cc
index e2968c1a2e6f900a49862811d923b9baa3dff1aa..f595771b3122a55b99b233d5d662aae227058980 100644
--- a/chrome/browser/ui/touch/tabs/touch_tab.cc
+++ b/chrome/browser/ui/touch/tabs/touch_tab.cc
@@ -193,15 +193,15 @@ void TouchTab::PaintIcon(gfx::Canvas* canvas) {
     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);
       }
     }