Move Singleton and related structs to namespace base

content/browser/cocoa/system_hotkey_helper_mac.mm

 // Copyright 2014 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 "content/browser/cocoa/system_hotkey_helper_mac.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/mac/foundation_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "content/browser/cocoa/system_hotkey_map.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
 NSString* kSystemHotkeyPlistExtension =
     @"/Preferences/com.apple.symbolichotkeys.plist";
 
 // Amount of time to delay loading the hotkeys in seconds.
 const int kLoadHotkeysDelaySeconds = 10;
 
 }  // namespace
 
 namespace content {
 
 // static
 SystemHotkeyHelperMac* SystemHotkeyHelperMac::GetInstance() {
-  return Singleton<SystemHotkeyHelperMac>::get();
+  return base::Singleton<SystemHotkeyHelperMac>::get();
 }
 
 void SystemHotkeyHelperMac::DeferredLoadSystemHotkeys() {
   BrowserThread::PostDelayedTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&SystemHotkeyHelperMac::LoadSystemHotkeys,
                  base::Unretained(this)),
       base::TimeDelta::FromSeconds(kLoadHotkeysDelaySeconds));
 }
@@ skipping 28 matching lines @@
 
 void SystemHotkeyHelperMac::FileDidLoad(NSDictionary* dictionary) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   bool success = map()->ParseDictionary(dictionary);
   UMA_HISTOGRAM_BOOLEAN("OSX.SystemHotkeyMap.LoadSuccess", success);
   [dictionary release];
 }
 
 }  // namespace content