Move Singleton and related structs to namespace base

chrome/browser/ui/cocoa/accelerators_cocoa.mm

 // 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/cocoa/accelerators_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
@@ skipping 133 matching lines @@
     ui::Accelerator accelerator =
         AcceleratorFromKeyCode(entry.key_code, entry.modifiers);
     accelerator_vector_.push_back(accelerator);
   }
 }
 
 AcceleratorsCocoa::~AcceleratorsCocoa() {}
 
 // static
 AcceleratorsCocoa* AcceleratorsCocoa::GetInstance() {
-  return Singleton<AcceleratorsCocoa>::get();
+  return base::Singleton<AcceleratorsCocoa>::get();
 }
 
 const ui::Accelerator* AcceleratorsCocoa::GetAcceleratorForCommand(
     int command_id) {
   AcceleratorMap::iterator it = accelerators_.find(command_id);
   if (it == accelerators_.end())
     return NULL;
   return &it->second;
 }
 
@@ skipping 17 matching lines @@
     NSUInteger mask = platform_accelerator->modifier_mask();
     BOOL maskEqual =
         (mask == modifiers) || ((mask & (~NSShiftKeyMask)) == modifiers);
     NSString* string = [NSString stringWithFormat:@"%C", shifted_character];
     if ([string isEqual:key_equivalent] && maskEqual)
       return &*it;
   }
 
   return NULL;
 }