Move Singleton and related structs to namespace base

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h

 // Copyright 2014 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_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTORY_H_
 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTORY_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 25 matching lines @@
 
   static void SetDeviceSettingsServiceForTesting(
       DeviceSettingsService* device_settings_service);
 
   scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();
 
   void SetOwnerKeyUtilForTesting(
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
 
  private:
-  friend struct DefaultSingletonTraits<OwnerSettingsServiceChromeOSFactory>;
+  friend struct base::DefaultSingletonTraits<
+      OwnerSettingsServiceChromeOSFactory>;
 
   OwnerSettingsServiceChromeOSFactory();
   ~OwnerSettingsServiceChromeOSFactory() override;
 
   static KeyedService* BuildInstanceFor(content::BrowserContext* context);
 
   // BrowserContextKeyedBaseFactory overrides:
   bool ServiceIsCreatedWithBrowserContext() const override;
 
   // BrowserContextKeyedServiceFactory implementation:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* browser_context) const override;
 
   scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSFactory);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTORY_H_