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

chrome/browser/ui/views/tab_icon_view.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/views/tab_icon_view.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/favicon_size.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/app_icon_win.h"
 #include "ui/gfx/icon_util.h"
 #endif
 
 static bool g_initialized = false;
-static SkBitmap* g_default_fav_icon = NULL;
+static SkBitmap* g_default_favicon = NULL;
 
 // static
 void TabIconView::InitializeIfNeeded() {
   if (!g_initialized) {
     g_initialized = true;
 
 #if defined(OS_WIN)
     // The default window icon is the application icon, not the default
     // favicon.
     HICON app_icon = GetAppIcon();
-    g_default_fav_icon =
+    g_default_favicon =
         IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16));
     DestroyIcon(app_icon);
 #else
-    g_default_fav_icon =
+    g_default_favicon =
         ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_PRODUCT_LOGO_16);
 #endif
   }
 }
 
 TabIconView::TabIconView(TabIconViewModel* model)
     : model_(model),
       throbber_running_(false),
       is_light_(false),
       throbber_frame_(0) {
@@ skipping 86 matching lines @@
     PaintThrobber(canvas);
   } else {
     SkBitmap favicon = model_->GetFavIconForTabIconView();
     if (!favicon.isNull()) {
       rendered = true;
       PaintFavIcon(canvas, favicon);
     }
   }
 
   if (!rendered)
-    PaintFavIcon(canvas, *g_default_fav_icon);
+    PaintFavIcon(canvas, *g_default_favicon);
 }
 
 gfx::Size TabIconView::GetPreferredSize() {
   return gfx::Size(kFaviconSize, kFaviconSize);
 }