Move Singleton and related structs to namespace base

content/browser/renderer_host/media/media_capture_devices_impl.cc

 // 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.
 
 #include "content/browser/renderer_host/media/media_capture_devices_impl.h"
 
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 10 matching lines @@
                      BrowserMainLoop::GetInstance()->media_stream_manager())));
 }
 
 }  // namespace
 
 MediaCaptureDevices* MediaCaptureDevices::GetInstance() {
   return MediaCaptureDevicesImpl::GetInstance();
 }
 
 MediaCaptureDevicesImpl* MediaCaptureDevicesImpl::GetInstance() {
-  return Singleton<MediaCaptureDevicesImpl>::get();
+  return base::Singleton<MediaCaptureDevicesImpl>::get();
 }
 
 const MediaStreamDevices&
 MediaCaptureDevicesImpl::GetAudioCaptureDevices() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!devices_enumerated_) {
     EnsureMonitorCaptureDevices();
     devices_enumerated_ = true;
   }
   return audio_devices_;
@@ skipping 48 matching lines @@
 }
 
 void MediaCaptureDevicesImpl::UpdateVideoDevicesOnUIThread(
     const MediaStreamDevices& devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   devices_enumerated_ = true;
   video_devices_ = devices;
 }
 
 }  // namespace content