Move Singleton and related structs to namespace base

chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

 // Copyright (c) 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/gesture_prefs_observer_factory_aura.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 165 matching lines @@
   service->Notify(chrome::NOTIFICATION_BROWSER_FLING_CURVE_PARAMETERS_CHANGED,
                   content::Source<GesturePrefsObserver>(this),
                   content::NotificationService::NoDetails());
 }
 
 }  // namespace
 
 // static
 GesturePrefsObserverFactoryAura*
 GesturePrefsObserverFactoryAura::GetInstance() {
-  return Singleton<GesturePrefsObserverFactoryAura>::get();
+  return base::Singleton<GesturePrefsObserverFactoryAura>::get();
 }
 
 GesturePrefsObserverFactoryAura::GesturePrefsObserverFactoryAura()
     : BrowserContextKeyedServiceFactory(
         "GesturePrefsObserverAura",
         BrowserContextDependencyManager::GetInstance()) {}
 
 GesturePrefsObserverFactoryAura::~GesturePrefsObserverFactoryAura() {}
 
 KeyedService* GesturePrefsObserverFactoryAura::BuildServiceInstanceFor(
@@ skipping 43 matching lines @@
   // Use same gesture preferences on incognito windows.
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const {
   // Some tests replace the PrefService of the TestingProfile after the
   // GesturePrefsObserver has been created, which makes Shutdown()
   // remove the registrar from a non-existent PrefService.
   return true;
 }