Move Singleton and related structs to namespace base

chrome/browser/ui/settings_window_manager.cc

 // Copyright (c) 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 "chrome/browser/ui/settings_window_manager.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/settings_window_manager_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace chrome {
 
 // static
 SettingsWindowManager* SettingsWindowManager::GetInstance() {
-  return Singleton<SettingsWindowManager>::get();
+  return base::Singleton<SettingsWindowManager>::get();
 }
 
 void SettingsWindowManager::AddObserver(
     SettingsWindowManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void SettingsWindowManager::RemoveObserver(
     SettingsWindowManagerObserver* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 53 matching lines @@
           iter->second == browser->session_id().id());
 }
 
 SettingsWindowManager::SettingsWindowManager() {
 }
 
 SettingsWindowManager::~SettingsWindowManager() {
 }
 
 }  // namespace chrome