Move Singleton and related structs to namespace base

chrome/browser/signin/easy_unlock_service_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/signin/easy_unlock_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 34 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   return base::FilePath();
 }
 
 }  // namespace
 
 // static
 EasyUnlockServiceFactory* EasyUnlockServiceFactory::GetInstance() {
-  return Singleton<EasyUnlockServiceFactory>::get();
+  return base::Singleton<EasyUnlockServiceFactory>::get();
 }
 
 // static
 EasyUnlockService* EasyUnlockServiceFactory::GetForBrowserContext(
     content::BrowserContext* browser_context) {
   return static_cast<EasyUnlockService*>(
       EasyUnlockServiceFactory::GetInstance()->GetServiceForBrowserContext(
           browser_context, true));
 }
 
@@ skipping 59 matching lines @@
 bool EasyUnlockServiceFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 bool EasyUnlockServiceFactory::ServiceIsNULLWhileTesting() const {
   // Don't create the service for TestingProfile used in unit_tests because
   // EasyUnlockService uses ExtensionSystem::ready().Post, which expects
   // a MessageLoop that does not exit in many unit_tests cases.
   return true;
 }