Move Singleton and related structs to namespace base

content/browser/theme_helper_mac.mm

 // Copyright 2013 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/theme_helper_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 118 matching lines @@
       content::ThemeHelperMac::GetPreferredScrollerStyle(), redraw,
       GetScrollAnimationEnabled(), GetButtonPlacement());
 }
 
 @end
 
 namespace content {
 
 // static
 ThemeHelperMac* ThemeHelperMac::GetInstance() {
-  return Singleton<ThemeHelperMac,
-      LeakySingletonTraits<ThemeHelperMac> >::get();
+  return base::Singleton<ThemeHelperMac,
+                         base::LeakySingletonTraits<ThemeHelperMac>>::get();
 }
 
 // static
 blink::ScrollerStyle ThemeHelperMac::GetPreferredScrollerStyle() {
   if (![NSScroller respondsToSelector:@selector(preferredScrollerStyle)])
     return blink::ScrollerStyleLegacy;
   return static_cast<blink::ScrollerStyle>([NSScroller preferredScrollerStyle]);
 }
 
 // static
@@ skipping 50 matching lines @@
       [defaults boolForKey:@"AppleScrollerPagingBehavior"];
   params.preferred_scroller_style = GetPreferredScrollerStyle();
   params.redraw = false;
   params.scroll_animation_enabled = GetScrollAnimationEnabled();
   params.button_placement = GetButtonPlacement();
 
   rph->Send(new ViewMsg_UpdateScrollbarTheme(params));
 }
 
 }  // namespace content