Move Singleton and related structs to namespace base

chrome/browser/chromeos/customization/customization_document.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_CUSTOMIZATION_DOCUMENT_H_
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_CUSTOMIZATION_DOCUMENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 90 matching lines @@
   const std::string& keyboard_layout() const { return keyboard_layout_; }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, VPD);
   FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, BadManifest);
   FRIEND_TEST_ALL_PREFIXES(ServicesCustomizationDocumentTest, MultiLanguage);
   friend class OobeLocalizationTest;
   friend void InitStartupCustomizationDocumentForTesting(
       const std::string& manifest);
-  friend struct DefaultSingletonTraits<StartupCustomizationDocument>;
+  friend struct base::DefaultSingletonTraits<StartupCustomizationDocument>;
 
   // C-tor for singleton construction.
   StartupCustomizationDocument();
 
   // C-tor for test construction.
   StartupCustomizationDocument(system::StatisticsProvider* provider,
                                const std::string& manifest);
 
   ~StartupCustomizationDocument() override;
 
@@ skipping 69 matching lines @@
   // customized wallpaper path (and to init default wallpaper path from it)
   // before first wallpaper is shown.
   static base::FilePath GetCustomizedWallpaperCacheDir();
   static base::FilePath GetCustomizedWallpaperDownloadedFileName();
 
   CustomizationWallpaperDownloader* wallpaper_downloader_for_testing() {
     return wallpaper_downloader_.get();
   }
 
  private:
-  friend struct DefaultSingletonTraits<ServicesCustomizationDocument>;
+  friend struct base::DefaultSingletonTraits<ServicesCustomizationDocument>;
   FRIEND_TEST_ALL_PREFIXES(CustomizationWallpaperDownloaderBrowserTest,
                            OEMWallpaperIsPresent);
   FRIEND_TEST_ALL_PREFIXES(CustomizationWallpaperDownloaderBrowserTest,
                            OEMWallpaperRetryFetch);
 
   typedef std::vector<base::WeakPtr<ServicesCustomizationExternalLoader> >
       ExternalLoaders;
 
   // Guard for a single application task (wallpaper downloading, for example).
   class ApplyingTask;
@@ skipping 113 matching lines @@
 
   // Weak factory for callbacks.
   base::WeakPtrFactory<ServicesCustomizationDocument> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_CUSTOMIZATION_DOCUMENT_H_