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

chrome/browser/ui/cocoa/toolbar_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 86 matching lines @@
 
 // A C++ delegate that handles the accelerators in the wrench menu.
 class WrenchAcceleratorDelegate : public menus::AcceleratorProvider {
  public:
   virtual bool GetAcceleratorForCommandId(int command_id,
       menus::Accelerator* accelerator_generic) {
     // Downcast so that when the copy constructor is invoked below, the key
     // string gets copied, too.
     menus::AcceleratorCocoa* out_accelerator =
         static_cast<menus::AcceleratorCocoa*>(accelerator_generic);
-    AcceleratorsCocoa* keymap = Singleton<AcceleratorsCocoa>::get();
+    AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance();
     const menus::AcceleratorCocoa* accelerator =
         keymap->GetAcceleratorForCommand(command_id);
     if (accelerator) {
       *out_accelerator = *accelerator;
       return true;
     }
     return false;
   }
 };
 
@@ skipping 101 matching lines @@
   // images loaded directly from nibs in a framework to not get their "template"
   // flags set properly. Thus, despite the images being set on the buttons in
   // the xib, we must set them in code.
   [backButton_ setImage:nsimage_cache::ImageNamed(kBackButtonImageName)];
   [forwardButton_ setImage:nsimage_cache::ImageNamed(kForwardButtonImageName)];
   [reloadButton_
       setImage:nsimage_cache::ImageNamed(kReloadButtonReloadImageName)];
   [homeButton_ setImage:nsimage_cache::ImageNamed(kHomeButtonImageName)];
   [wrenchButton_ setImage:nsimage_cache::ImageNamed(kWrenchButtonImageName)];
 
-  if (Singleton<UpgradeDetector>::get()->notify_upgrade())
+  if (UpgradeDetector::GetInstance()->notify_upgrade())
     [self badgeWrenchMenu];
 
   [backButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [forwardButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [reloadButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [homeButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [wrenchButton_ setShowsBorderOnlyWhileMouseInside:YES];
 
   [self initCommandStatus:commands_];
   locationBarView_.reset(new LocationBarViewMac(locationBar_,
@@ skipping 504 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end