Move Singleton and related structs to namespace base

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_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/ownership/owner_settings_service_chromeos_factory.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ skipping 31 matching lines @@
 OwnerSettingsServiceChromeOS*
 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   return static_cast<OwnerSettingsServiceChromeOS*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
 OwnerSettingsServiceChromeOSFactory*
 OwnerSettingsServiceChromeOSFactory::GetInstance() {
-  return Singleton<OwnerSettingsServiceChromeOSFactory>::get();
+  return base::Singleton<OwnerSettingsServiceChromeOSFactory>::get();
 }
 
 // static
 void OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
     DeviceSettingsService* device_settings_service) {
   g_device_settings_service_for_testing_ = device_settings_service;
 }
 
 scoped_refptr<ownership::OwnerKeyUtil>
 OwnerSettingsServiceChromeOSFactory::GetOwnerKeyUtil() {
@@ skipping 27 matching lines @@
     const {
   return true;
 }
 
 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   return BuildInstanceFor(context);
 }
 
 }  // namespace chromeos