Move Singleton and related structs to namespace base

chrome/browser/sync_file_system/sync_file_system_service_factory.cc

 // 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.
 
 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "extensions/browser/extension_registry_factory.h"
 
 namespace sync_file_system {
 
 // static
 SyncFileSystemService* SyncFileSystemServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<SyncFileSystemService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 SyncFileSystemServiceFactory* SyncFileSystemServiceFactory::GetInstance() {
-  return Singleton<SyncFileSystemServiceFactory>::get();
+  return base::Singleton<SyncFileSystemServiceFactory>::get();
 }
 
 void SyncFileSystemServiceFactory::set_mock_local_file_service(
     scoped_ptr<LocalFileSyncService> mock_local_service) {
   mock_local_file_service_ = mock_local_service.Pass();
 }
 
 void SyncFileSystemServiceFactory::set_mock_remote_file_service(
     scoped_ptr<RemoteFileSyncService> mock_remote_service) {
   mock_remote_file_service_ = mock_remote_service.Pass();
@@ skipping 35 matching lines @@
     remote_file_service = RemoteFileSyncService::CreateForBrowserContext(
         context, service->task_logger());
   }
 
   service->Initialize(local_file_service.Pass(),
                       remote_file_service.Pass());
   return service;
 }
 
 }  // namespace sync_file_system