Move Singleton and related structs to namespace base

chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.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/easy_unlock/easy_unlock_tpm_key_manager_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/user_manager/user.h"
 
 namespace {
 
 PrefService* GetLocalState() {
   return g_browser_process ? g_browser_process->local_state() : NULL;
 }
 
 }  // namespace
 
 // static
 EasyUnlockTpmKeyManagerFactory* EasyUnlockTpmKeyManagerFactory::GetInstance() {
-  return Singleton<EasyUnlockTpmKeyManagerFactory>::get();
+  return base::Singleton<EasyUnlockTpmKeyManagerFactory>::get();
 }
 
 // static
 EasyUnlockTpmKeyManager* EasyUnlockTpmKeyManagerFactory::Get(
     content::BrowserContext* browser_context) {
   return static_cast<EasyUnlockTpmKeyManager*>(
       EasyUnlockTpmKeyManagerFactory::GetInstance()
           ->GetServiceForBrowserContext(browser_context, true));
 }
 
@@ skipping 26 matching lines @@
     user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
   return new EasyUnlockTpmKeyManager(
       user ? user->email() : std::string(),
       user ? user->username_hash() : std::string(), GetLocalState());
 }
 
 content::BrowserContext* EasyUnlockTpmKeyManagerFactory::GetBrowserContextToUse(
       content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }