Move Singleton and related structs to namespace base

chrome/browser/sync_file_system/sync_file_system_service_factory.h

 // Copyright (c) 2013 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_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 17 matching lines @@
   // For testing this must be called before GetForProfile is called.
   // Otherwise a new DriveFileSyncService is created for the new service.
   // Since we use scoped_ptr it's one-off and the instance is passed
   // to the newly created SyncFileSystemService.
   void set_mock_local_file_service(
       scoped_ptr<LocalFileSyncService> mock_local_service);
   void set_mock_remote_file_service(
       scoped_ptr<RemoteFileSyncService> mock_remote_service);
 
  private:
-  friend struct DefaultSingletonTraits<SyncFileSystemServiceFactory>;
+  friend struct base::DefaultSingletonTraits<SyncFileSystemServiceFactory>;
   SyncFileSystemServiceFactory();
   ~SyncFileSystemServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory overrides.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 
   mutable scoped_ptr<LocalFileSyncService> mock_local_file_service_;
   mutable scoped_ptr<RemoteFileSyncService> mock_remote_file_service_;
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_