Move content\browser\renderer_host\media to content namespace.

content/browser/browser_main_loop.h

Index: content/browser/browser_main_loop.h
===================================================================
--- content/browser/browser_main_loop.h	(revision 164646)
+++ content/browser/browser_main_loop.h	(working copy)
@@ -23,10 +23,6 @@
 class AudioManager;
 }
 
-namespace media_stream {
-class MediaStreamManager;
-}
-
 namespace net {
 class NetworkChangeNotifier;
 }
@@ -36,6 +32,7 @@
 class BrowserMainParts;
 class BrowserShutdownImpl;
 class BrowserThreadImpl;
+class MediaStreamManager;
 class ResourceDispatcherHostImpl;
 class SpeechRecognitionManagerImpl;
 class WebKitThread;
@@ -75,7 +72,7 @@
 
   // Can be called on any thread.
   static media::AudioManager* GetAudioManager();
-  static media_stream::MediaStreamManager* GetMediaStreamManager();
+  static MediaStreamManager* GetMediaStreamManager();
 
  private:
   // For ShutdownThreadsAndCleanUp.
@@ -99,7 +96,7 @@
   scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<media::AudioManager> audio_manager_;
-  scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
+  scoped_ptr<MediaStreamManager> media_stream_manager_;
   // Per-process listener for online state changes.
   scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
 #if defined(OS_WIN)