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

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 154 matching lines @@
   int x = favicon_bounds_.x();
   int y = favicon_bounds_.y();
 
   TouchTabImage* tab_image = &tab_active;
   int x_base = tab_image->image_l->width();
 
   x += x_base;
 
   if (base::i18n::IsRTL()) {
     x = width() - x -
-        (data().favicon.isNull() ? kFavIconSize : data().favicon.width());
+        (data().favicon.isNull() ? kFaviconSize : data().favicon.width());
   }
 
   int favicon_x = x;
-  if (!data().favicon.isNull() && data().favicon.width() != kFavIconSize)
-    favicon_x += (data().favicon.width() - kFavIconSize) / 2;
+  if (!data().favicon.isNull() && data().favicon.width() != kFaviconSize)
+    favicon_x += (data().favicon.width() - kFaviconSize) / 2;
 
   if (data().network_state != TabRendererData::NETWORK_STATE_NONE) {
     ThemeProvider* tp = GetThemeProvider();
     SkBitmap frames(*tp->GetBitmapNamed(
         (data().network_state == TabRendererData::NETWORK_STATE_WAITING) ?
         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);
@@ skipping 44 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();
 }