Move Singleton and related structs to namespace base

chrome/browser/chromeos/customization/customization_document.cc

 // Copyright (c) 2012 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/customization/customization_document.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 259 matching lines @@
     system::StatisticsProvider* statistics_provider,
     const std::string& manifest)
     : CustomizationDocument(kAcceptedManifestVersion) {
   LoadManifestFromString(manifest);
   Init(statistics_provider);
 }
 
 StartupCustomizationDocument::~StartupCustomizationDocument() {}
 
 StartupCustomizationDocument* StartupCustomizationDocument::GetInstance() {
-  return Singleton<StartupCustomizationDocument,
-      DefaultSingletonTraits<StartupCustomizationDocument> >::get();
+  return base::Singleton<
+      StartupCustomizationDocument,
+      base::DefaultSingletonTraits<StartupCustomizationDocument>>::get();
 }
 
 void StartupCustomizationDocument::Init(
     system::StatisticsProvider* statistics_provider) {
   if (IsReady()) {
     root_->GetString(kInitialLocaleAttr, &initial_locale_);
     root_->GetString(kInitialTimezoneAttr, &initial_timezone_);
     root_->GetString(kKeyboardLayoutAttr, &keyboard_layout_);
 
     std::string hwid;
@@ skipping 128 matching lines @@
   LoadManifestFromString(manifest);
 }
 
 ServicesCustomizationDocument::~ServicesCustomizationDocument() {}
 
 // static
 ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() {
   if (g_test_services_customization_document)
     return g_test_services_customization_document;
 
-  return Singleton<ServicesCustomizationDocument,
-      DefaultSingletonTraits<ServicesCustomizationDocument> >::get();
+  return base::Singleton<
+      ServicesCustomizationDocument,
+      base::DefaultSingletonTraits<ServicesCustomizationDocument>>::get();
 }
 
 // static
 void ServicesCustomizationDocument::RegisterPrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(kServicesCustomizationAppliedPref, false);
   registry->RegisterStringPref(prefs::kCustomizationDefaultWallpaperURL,
                                std::string());
 }
 
@@ skipping 512 matching lines @@
   apply_tasks_success_ += success;
 
   if (apply_tasks_started_ != apply_tasks_finished_)
     return;
 
   if (apply_tasks_success_ == apply_tasks_finished_)
     SetApplied(true);
 }
 
 }  // namespace chromeos