Move Singleton and related structs to namespace base

chrome/browser/media/media_capture_devices_dispatcher.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_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 130 matching lines @@
 
   DesktopStreamsRegistry* GetDesktopStreamsRegistry();
 
   bool IsDesktopCaptureInProgress();
 
   // Only for testing.
   void SetTestAudioCaptureDevices(const content::MediaStreamDevices& devices);
   void SetTestVideoCaptureDevices(const content::MediaStreamDevices& devices);
 
  private:
-  friend struct DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
+  friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
 
   MediaCaptureDevicesDispatcher();
   ~MediaCaptureDevicesDispatcher() override;
 
   // Called by the MediaObserver() functions, executed on UI thread.
   void NotifyAudioDevicesChangedOnUIThread();
   void NotifyVideoDevicesChangedOnUIThread();
   void UpdateMediaRequestStateOnUIThread(
       int render_process_id,
       int render_frame_id,
@@ skipping 20 matching lines @@
 
   scoped_ptr<DesktopStreamsRegistry> desktop_streams_registry_;
 
   // Handlers for processing media access requests.
   ScopedVector<MediaAccessHandler> media_access_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_