Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

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 215 matching lines @@
 #endif
   AddChildView(app_menu_);
 
   location_bar_->Init();
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
   browser_actions_->Init();
 
   SetProfile(profile);
 
   // Accessibility specific tooltip text.
-  if (Singleton<BrowserAccessibilityState>()->IsAccessibleBrowser()) {
+  if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) {
     back_->SetTooltipText(l10n_util::GetString(IDS_ACCNAME_TOOLTIP_BACK));
     forward_->SetTooltipText(l10n_util::GetString(IDS_ACCNAME_TOOLTIP_FORWARD));
   }
 }
 
 void ToolbarView::SetProfile(Profile* profile) {
   if (profile != profile_) {
     profile_ = profile;
     location_bar_->SetProfile(profile);
   }
@@ skipping 374 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, private:
 
 bool ToolbarView::IsUpgradeRecommended() {
 #if defined(OS_CHROMEOS)
   return (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status ==
           chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT);
 #else
-  return (Singleton<UpgradeDetector>::get()->notify_upgrade());
+  return (UpgradeDetector::GetInstance()->notify_upgrade());
 #endif
 }
 
 bool ToolbarView::ShouldShowBackgroundPageBadge() {
   return BackgroundPageTracker::GetSingleton()->
       GetUnacknowledgedBackgroundPageCount() > 0;
 }
 
 bool ToolbarView::ShouldShowIncompatibilityWarning() {
 #if defined(OS_WIN)
@@ skipping 120 matching lines @@
   SkBitmap* badge = tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
   string16 badge_text = base::FormatNumber(
       BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
   return badge_util::DrawBadgeIconOverlay(
       *badge,
       kBadgeTextFontSize,
       badge_text,
       l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW));
 }