Move Singleton and related structs to namespace base

chrome/browser/chromeos/drive/drive_integration_service.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_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 204 matching lines @@
   static DriveIntegrationService* GetForProfile(Profile* profile);
 
   // Returns the DriveIntegrationService that is already associated with
   // |profile|, if it is not yet created it will return NULL.
   static DriveIntegrationService* FindForProfile(Profile* profile);
 
   // Returns the DriveIntegrationServiceFactory instance.
   static DriveIntegrationServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<DriveIntegrationServiceFactory>;
+  friend struct base::DefaultSingletonTraits<DriveIntegrationServiceFactory>;
 
   DriveIntegrationServiceFactory();
   ~DriveIntegrationServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory overrides.
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 
   // This is static so it can be set without instantiating the factory. This
   // allows factory creation to be delayed until it normally happens (on profile
   // creation) rather than when tests are set up. DriveIntegrationServiceFactory
   // transitively depends on ExtensionSystemFactory which crashes if created too
   // soon (i.e. before the BrowserProcess exists).
   static FactoryCallback* factory_for_test_;
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_