Move Singleton and related structs to namespace base

chromeos/system/statistics_provider.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/system/statistics_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 95 matching lines @@
                            std::string* result) override;
   bool HasMachineStatistic(const std::string& name) override;
   bool GetMachineFlag(const std::string& name, bool* result) override;
   bool HasMachineFlag(const std::string& name) override;
   void Shutdown() override;
 
   static StatisticsProviderImpl* GetInstance();
 
  protected:
   typedef std::map<std::string, bool> MachineFlags;
-  friend struct DefaultSingletonTraits<StatisticsProviderImpl>;
+  friend struct base::DefaultSingletonTraits<StatisticsProviderImpl>;
 
   StatisticsProviderImpl();
   ~StatisticsProviderImpl() override;
 
   // Waits up to |kTimeoutSecs| for statistics to be loaded. Returns true if
   // they were loaded successfully.
   bool WaitForStatisticsLoaded();
 
   // Loads the machine statistics off of disk. Runs on the file thread.
   void LoadMachineStatistics(bool load_oem_manifest);
@@ skipping 208 matching lines @@
   machine_flags_[kOemCanExitEnterpriseEnrollmentKey] =
       oem_manifest.can_exit_enrollment;
   machine_flags_[kOemKeyboardDrivenOobeKey] =
       oem_manifest.keyboard_driven_oobe;
 
   oem_manifest_loaded_ = true;
   VLOG(1) << "Loaded OEM Manifest statistics from " << file.value();
 }
 
 StatisticsProviderImpl* StatisticsProviderImpl::GetInstance() {
-  return Singleton<StatisticsProviderImpl,
-                   DefaultSingletonTraits<StatisticsProviderImpl> >::get();
+  return base::Singleton<
+      StatisticsProviderImpl,
+      base::DefaultSingletonTraits<StatisticsProviderImpl>>::get();
 }
 
 static StatisticsProvider* g_test_statistics_provider = NULL;
 
 // static
 StatisticsProvider* StatisticsProvider::GetInstance() {
   if (g_test_statistics_provider)
     return g_test_statistics_provider;
   return StatisticsProviderImpl::GetInstance();
 }
 
 // static
 void StatisticsProvider::SetTestProvider(StatisticsProvider* test_provider) {
   g_test_statistics_provider = test_provider;
 }
 
 }  // namespace system
 }  // namespace chromeos