Move Singleton and related structs to namespace base

chromeos/settings/timezone_settings.cc

 // Copyright 2013 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 "chromeos/settings/timezone_settings.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 282 matching lines @@
 
 // The TimezoneSettings implementation used in production.
 class TimezoneSettingsImpl : public TimezoneSettingsBaseImpl {
  public:
   // TimezoneSettings implementation:
   void SetTimezone(const icu::TimeZone& timezone) override;
 
   static TimezoneSettingsImpl* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<TimezoneSettingsImpl>;
+  friend struct base::DefaultSingletonTraits<TimezoneSettingsImpl>;
 
   TimezoneSettingsImpl();
 
   DISALLOW_COPY_AND_ASSIGN(TimezoneSettingsImpl);
 };
 
 // The stub TimezoneSettings implementation used on Linux desktop.
 class TimezoneSettingsStubImpl : public TimezoneSettingsBaseImpl {
  public:
   // TimezoneSettings implementation:
   void SetTimezone(const icu::TimeZone& timezone) override;
 
   static TimezoneSettingsStubImpl* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<TimezoneSettingsStubImpl>;
+  friend struct base::DefaultSingletonTraits<TimezoneSettingsStubImpl>;
 
   TimezoneSettingsStubImpl();
 
   DISALLOW_COPY_AND_ASSIGN(TimezoneSettingsStubImpl);
 };
 
 TimezoneSettingsBaseImpl::~TimezoneSettingsBaseImpl() {
   STLDeleteElements(&timezones_);
 }
 
@@ skipping 50 matching lines @@
   // It's safe to change the timezone config files in the background as the
   // following operations don't depend on the completion of the config change.
   base::WorkerPool::GetTaskRunner(true /* task is slow */)->
       PostTask(FROM_HERE, base::Bind(&SetTimezoneIDFromString, id));
   icu::TimeZone::setDefault(*known_timezone);
   FOR_EACH_OBSERVER(Observer, observers_, TimezoneChanged(*known_timezone));
 }
 
 // static
 TimezoneSettingsImpl* TimezoneSettingsImpl::GetInstance() {
-  return Singleton<TimezoneSettingsImpl,
-                   DefaultSingletonTraits<TimezoneSettingsImpl> >::get();
+  return base::Singleton<
+      TimezoneSettingsImpl,
+      base::DefaultSingletonTraits<TimezoneSettingsImpl>>::get();
 }
 
 TimezoneSettingsImpl::TimezoneSettingsImpl() {
   std::string id = GetTimezoneIDAsString();
   if (id.empty()) {
     id = kFallbackTimeZoneId;
     LOG(ERROR) << "Got an empty string for timezone, default to '" << id;
   }
 
   timezone_.reset(icu::TimeZone::createTimeZone(
@@ skipping 24 matching lines @@
 
   std::string id = base::UTF16ToUTF8(GetTimezoneID(*known_timezone));
   VLOG(1) << "Setting timezone to " << id;
   timezone_.reset(known_timezone->clone());
   icu::TimeZone::setDefault(*known_timezone);
   FOR_EACH_OBSERVER(Observer, observers_, TimezoneChanged(*known_timezone));
 }
 
 // static
 TimezoneSettingsStubImpl* TimezoneSettingsStubImpl::GetInstance() {
-  return Singleton<TimezoneSettingsStubImpl,
-      DefaultSingletonTraits<TimezoneSettingsStubImpl> >::get();
+  return base::Singleton<
+      TimezoneSettingsStubImpl,
+      base::DefaultSingletonTraits<TimezoneSettingsStubImpl>>::get();
 }
 
 TimezoneSettingsStubImpl::TimezoneSettingsStubImpl() {
   timezone_.reset(icu::TimeZone::createDefault());
   const icu::TimeZone* known_timezone = GetKnownTimezoneOrNull(*timezone_);
   if (known_timezone != NULL && *known_timezone != *timezone_)
     timezone_.reset(known_timezone->clone());
 }
 
 }  // namespace
@@ skipping 14 matching lines @@
 
 // static
 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
   icu::UnicodeString id;
   timezone.getID(id);
   return base::string16(id.getBuffer(), id.length());
 }
 
 }  // namespace system
 }  // namespace chromeos