Move Singleton and related structs to namespace base

chrome/browser/chromeos/file_manager/volume_manager_factory.cc

 // Copyright 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/chromeos/file_manager/volume_manager_factory.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/file_system_provider/service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 namespace file_manager {
 
 VolumeManager* VolumeManagerFactory::Get(content::BrowserContext* context) {
   return static_cast<VolumeManager*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 VolumeManagerFactory* VolumeManagerFactory::GetInstance() {
-  return Singleton<VolumeManagerFactory>::get();
+  return base::Singleton<VolumeManagerFactory>::get();
 }
 
 content::BrowserContext* VolumeManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Explicitly allow this manager in guest login mode.
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 bool VolumeManagerFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
@@ skipping 21 matching lines @@
           "VolumeManagerFactory",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(drive::DriveIntegrationServiceFactory::GetInstance());
   DependsOn(chromeos::file_system_provider::ServiceFactory::GetInstance());
 }
 
 VolumeManagerFactory::~VolumeManagerFactory() {
 }
 
 }  // namespace file_manager