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

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_dispatcher_host.cc	(revision 164646)
+++ content/browser/renderer_host/media/media_stream_dispatcher_host.cc	(working copy)
@@ -9,12 +9,8 @@
 #include "content/common/media/media_stream_options.h"
 #include "googleurl/src/gurl.h"
 
-using content::BrowserMainLoop;
-using content::BrowserMessageFilter;
-using content::BrowserThread;
+namespace content {
 
-namespace media_stream {
-
 struct MediaStreamDispatcherHost::StreamRequest {
   StreamRequest() : render_view_id(0), page_request_id(0) {}
   StreamRequest(int render_view_id, int page_request_id)
@@ -132,7 +128,7 @@
 void MediaStreamDispatcherHost::OnGenerateStream(
     int render_view_id,
     int page_request_id,
-    const media_stream::StreamOptions& components,
+    const StreamOptions& components,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
            << render_view_id << ", "
@@ -143,8 +139,8 @@
            << security_origin.spec() << ")";
 
   std::string label;
-  if (components.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE ||
-      components.video_type == content::MEDIA_TAB_VIDEO_CAPTURE) {
+  if (components.audio_type == MEDIA_TAB_AUDIO_CAPTURE ||
+      components.video_type == MEDIA_TAB_VIDEO_CAPTURE) {
     const std::string& device_id = components.video_device_id;
     DCHECK(!device_id.empty());
     // TODO(justinlin): Cleanup/get rid of GenerateStreamForDevice and merge
@@ -187,7 +183,7 @@
 void MediaStreamDispatcherHost::OnEnumerateDevices(
     int render_view_id,
     int page_request_id,
-    media_stream::MediaStreamType type,
+    MediaStreamType type,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices("
            << render_view_id << ", "
@@ -206,7 +202,7 @@
     int render_view_id,
     int page_request_id,
     const std::string& device_id,
-    media_stream::MediaStreamType type,
+    MediaStreamType type,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnOpenDevice("
            << render_view_id << ", "
@@ -226,4 +222,4 @@
   return BrowserMainLoop::GetMediaStreamManager();
 }
 
-}  // namespace media_stream
+}  // namespace content