Move Singleton and related structs to namespace base

chrome/browser/chromeos/login/session/user_session_manager.cc

 // Copyright 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/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 305 matching lines @@
 }
 
 void UserSessionStateObserver::PendingUserSessionsRestoreFinished() {
 }
 
 UserSessionStateObserver::~UserSessionStateObserver() {
 }
 
 // static
 UserSessionManager* UserSessionManager::GetInstance() {
-  return Singleton<UserSessionManager,
-      DefaultSingletonTraits<UserSessionManager> >::get();
+  return base::Singleton<UserSessionManager, base::DefaultSingletonTraits<
+                                                 UserSessionManager>>::get();
 }
 
 // static
 void UserSessionManager::OverrideHomedir() {
   // Override user homedir, check for ProfileManager being initialized as
   // it may not exist in unit tests.
   if (g_browser_process->profile_manager()) {
     user_manager::UserManager* user_manager = user_manager::UserManager::Get();
     if (user_manager->GetLoggedInUsers().size() == 1) {
       base::FilePath homedir = ProfileHelper::GetProfilePathByUserIdHash(
@@ skipping 1418 matching lines @@
   token_handle_util_.reset();
 }
 
 void UserSessionManager::CreateTokenUtilIfMissing() {
   if (!token_handle_util_.get())
     token_handle_util_.reset(
         new TokenHandleUtil(user_manager::UserManager::Get()));
 }
 
 }  // namespace chromeos