Move Singleton and related structs to namespace base

chrome/browser/password_manager/password_store_factory.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_PASSWORD_MANAGER_PASSWORD_STORE_FACTORY_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_FACTORY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ skipping 49 matching lines @@
 
   // Called by the PasswordDataTypeController whenever there is a possibility
   // that syncing passwords has just started or ended for |profile|.
   static void OnPasswordsSyncedStatePotentiallyChanged(Profile* profile);
 
   // Trims the affiliation cache for |profile| if affiliation-based matching is
   // enabled, and completely deletes it otherwise.
   static void TrimOrDeleteAffiliationCache(Profile* profile);
 
  private:
-  friend struct DefaultSingletonTraits<PasswordStoreFactory>;
+  friend struct base::DefaultSingletonTraits<PasswordStoreFactory>;
 
   PasswordStoreFactory();
   ~PasswordStoreFactory() override;
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
   LocalProfileId GetLocalProfileId(PrefService* prefs) const;
 #endif
 
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
@@ skipping 35 matching lines @@
   static base::nix::DesktopEnvironment GetDesktopEnvironment();
   static void RecordBackendStatistics(base::nix::DesktopEnvironment desktop_env,
                                       const std::string& command_line_flag,
                                       LinuxBackendUsed used_backend);
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreFactory);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_FACTORY_H_