Move Singleton and related structs to namespace base

chrome/browser/ui/libgtk2ui/g_object_destructor_filo.cc

 // Copyright (c) 2012 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/libgtk2ui/g_object_destructor_filo.h"
 
 #include <glib-object.h>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 
 namespace libgtk2ui {
 
 GObjectDestructorFILO::GObjectDestructorFILO() {
 }
 
 GObjectDestructorFILO::~GObjectDestructorFILO() {
   // Probably CHECK(handler_map_.empty()) would look natural here. But
   // some tests (some views_unittests) violate this assertion.
 }
 
 // static
 GObjectDestructorFILO* GObjectDestructorFILO::GetInstance() {
-  return Singleton<GObjectDestructorFILO>::get();
+  return base::Singleton<GObjectDestructorFILO>::get();
 }
 
 void GObjectDestructorFILO::Connect(
     GObject* object, DestructorHook callback, void* context) {
   const Hook hook(object, callback, context);
   HandlerMap::iterator iter = handler_map_.find(object);
   if (iter == handler_map_.end()) {
     g_object_weak_ref(object, WeakNotifyThunk, this);
     handler_map_[object].push_front(hook);
   } else {
@@ skipping 45 matching lines @@
   HandlerList dtors;
   iter->second.swap(dtors);
   handler_map_.erase(iter);
 
   // Execute hooks in local list in FILO order.
   for (HandlerList::iterator i = dtors.begin(); i != dtors.end(); ++i)
     i->callback(i->context, where_the_object_was);
 }
 
 }  // namespace libgtk2ui