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

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

 // 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.
 
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
 #include "content/browser/browser_main_loop.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "googleurl/src/gurl.h"
 
-using content::BrowserMainLoop;
-using content::BrowserMessageFilter;
-using content::BrowserThread;
-
-namespace media_stream {
+namespace content {
 
 struct MediaStreamDispatcherHost::StreamRequest {
   StreamRequest() : render_view_id(0), page_request_id(0) {}
   StreamRequest(int render_view_id, int page_request_id)
       : render_view_id(render_view_id),
         page_request_id(page_request_id ) {
   }
   int render_view_id;
   // Id of the request generated by MediaStreamDispatcher.
   int page_request_id;
@@ skipping 98 matching lines @@
   streams_.clear();
 }
 
 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {
   DCHECK(streams_.empty());
 }
 
 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 << ", "
            << page_request_id << ", ["
            << " audio:" << components.audio_type
            << " video:" << components.video_type
            << " ], "
            << 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
     // with the regular GenerateStream.
     GetManager()->GenerateStreamForDevice(
         this, render_process_id_, render_view_id,
         components, device_id, security_origin, &label);
   } else {
     GetManager()->GenerateStream(this, render_process_id_, render_view_id,
                                  components, security_origin, &label);
@@ skipping 22 matching lines @@
            << ", {label = " << label <<  "})";
 
   StreamMap::iterator it = streams_.find(label);
   GetManager()->StopGeneratedStream(label);
   streams_.erase(it);
 }
 
 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 << ", "
            << page_request_id << ", "
            << type << ", "
            << security_origin.spec() << ")";
 
   std::string label;
   GetManager()->EnumerateDevices(this, render_process_id_, render_view_id,
                                  type, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 void MediaStreamDispatcherHost::OnOpenDevice(
     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 << ", "
            << page_request_id << ", device_id: "
            << device_id.c_str() << ", type: "
            << type << ", "
            << security_origin.spec() << ")";
 
   std::string label;
   GetManager()->OpenDevice(this, render_process_id_, render_view_id,
                            device_id, type, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 MediaStreamManager* MediaStreamDispatcherHost::GetManager() {
   return BrowserMainLoop::GetMediaStreamManager();
 }
 
-}  // namespace media_stream
+}  // namespace content