Move Singleton and related structs to namespace base

chrome/browser/signin/cross_device_promo_factory.cc

 // Copyright 2015 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/cross_device_promo_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
@@ skipping 19 matching lines @@
 }
 
 // static
 CrossDevicePromo* CrossDevicePromoFactory::GetForProfile(Profile* profile) {
   return static_cast<CrossDevicePromo*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 CrossDevicePromoFactory* CrossDevicePromoFactory::GetInstance() {
-  return Singleton<CrossDevicePromoFactory>::get();
+  return base::Singleton<CrossDevicePromoFactory>::get();
 }
 
 void CrossDevicePromoFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* user_prefs) {
   user_prefs->RegisterBooleanPref(prefs::kCrossDevicePromoOptedOut, false);
   user_prefs->RegisterBooleanPref(prefs::kCrossDevicePromoShouldBeShown, false);
   user_prefs->RegisterInt64Pref(
       prefs::kCrossDevicePromoObservedSingleAccountCookie,
       base::Time().ToInternalValue());
   user_prefs->RegisterInt64Pref(
       prefs::kCrossDevicePromoNextFetchListDevicesTime,
       base::Time().ToInternalValue());
   user_prefs->RegisterIntegerPref(prefs::kCrossDevicePromoNumDevices, 0);
   user_prefs->RegisterInt64Pref(prefs::kCrossDevicePromoLastDeviceActiveTime,
                                 base::Time().ToInternalValue());
 }
 
 KeyedService* CrossDevicePromoFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = Profile::FromBrowserContext(context);
   CrossDevicePromo* service = new CrossDevicePromo(
       SigninManagerFactory::GetForProfile(profile),
       GaiaCookieManagerServiceFactory::GetForProfile(profile),
       ChromeSigninClientFactory::GetForProfile(profile), profile->GetPrefs());
   return service;
 }