Move Singleton and related structs to namespace base

chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc

 // 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 "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const char kAppMenuRegistrarName[] = "com.canonical.AppMenu.Registrar";
 const char kAppMenuRegistrarPath[] = "/com/canonical/AppMenu/Registrar";
 
 }  // namespace
 
 // static
 GlobalMenuBarRegistrarX11* GlobalMenuBarRegistrarX11::GetInstance() {
-  return Singleton<GlobalMenuBarRegistrarX11>::get();
+  return base::Singleton<GlobalMenuBarRegistrarX11>::get();
 }
 
 void GlobalMenuBarRegistrarX11::OnWindowMapped(unsigned long xid) {
   live_xids_.insert(xid);
 
   if (registrar_proxy_)
     RegisterXID(xid);
 }
 
 void GlobalMenuBarRegistrarX11::OnWindowUnmapped(unsigned long xid) {
@@ skipping 98 matching lines @@
 
 void GlobalMenuBarRegistrarX11::OnNameOwnerChanged(GObject* /* ignored */,
                                                    GParamSpec* /* ignored */) {
   // If the name owner changed, we need to reregister all the live xids with
   // the system.
   for (std::set<unsigned long>::const_iterator it = live_xids_.begin();
        it != live_xids_.end(); ++it) {
     RegisterXID(*it);
   }
 }