Rename all methods accessing Singleton<T> as GetInstance().

chrome/browser/ui/views/toolbar_view.cc

 // Copyright (c) 2010 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/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/number_formatting.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 337 matching lines @@
   wrench_menu_->RunMenu(app_menu_);
 
 #if defined(OS_CHROMEOS)
 cleanup:
 #endif
   if (destroyed_flag)
     return;
   destroyed_flag_ = NULL;
 
   // Stop showing the background app badge also.
-  BackgroundPageTracker::GetSingleton()->AcknowledgeBackgroundPages();
+  BackgroundPageTracker::GetInstance()->AcknowledgeBackgroundPages();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, LocationBarView::Delegate implementation:
 
 TabContentsWrapper* ToolbarView::GetTabContentsWrapper() {
   return browser_->GetSelectedTabContentsWrapper();
 }
 
 InstantController* ToolbarView::GetInstant() {
@@ skipping 257 matching lines @@
 bool ToolbarView::IsUpgradeRecommended() {
 #if defined(OS_CHROMEOS)
   return (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status ==
           chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT);
 #else
   return (UpgradeDetector::GetInstance()->notify_upgrade());
 #endif
 }
 
 bool ToolbarView::ShouldShowBackgroundPageBadge() {
-  return BackgroundPageTracker::GetSingleton()->
+  return BackgroundPageTracker::GetInstance()->
       GetUnacknowledgedBackgroundPageCount() > 0;
 }
 
 bool ToolbarView::ShouldShowIncompatibilityWarning() {
 #if defined(OS_WIN)
-  EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetSingleton();
+  EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
   return loaded_modules->confirmed_bad_modules_detected() > 0;
 #else
   return false;
 #endif
 }
 
 int ToolbarView::PopupTopSpacing() const {
   return GetWindow()->GetNonClientView()->UseNativeFrame() ?
       0 : kPopupTopSpacingNonGlass;
 }
@@ skipping 101 matching lines @@
 
   canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);
 
   return canvas->ExtractBitmap();
 }
 
 SkBitmap ToolbarView::GetBackgroundPageBadge() {
   ThemeProvider* tp = GetThemeProvider();
   SkBitmap* badge = tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
   string16 badge_text = base::FormatNumber(
-      BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
+      BackgroundPageTracker::GetInstance()->GetBackgroundPageCount());
   return badge_util::DrawBadgeIconOverlay(
       *badge,
       kBadgeTextFontSize,
       badge_text,
       l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW));
 }