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

content/browser/renderer_host/media/audio_input_device_manager.cc

Index: content/browser/renderer_host/media/audio_input_device_manager.cc
===================================================================
--- content/browser/renderer_host/media/audio_input_device_manager.cc	(revision 164646)
+++ content/browser/renderer_host/media/audio_input_device_manager.cc	(working copy)
@@ -13,10 +13,8 @@
 #include "media/audio/audio_input_ipc.h"
 #include "media/audio/audio_manager_base.h"
 
-using content::BrowserThread;
+namespace content {
 
-namespace media_stream {
-
 const int AudioInputDeviceManager::kFakeOpenSessionId = 1;
 
 namespace {
@@ -136,7 +134,7 @@
        ++it) {
     // NOTE: Only support enumeration of the MEDIA_DEVICE_AUDIO_CAPTURE type.
     devices->push_back(StreamDeviceInfo(
-        content::MEDIA_DEVICE_AUDIO_CAPTURE, it->device_name,
+        MEDIA_DEVICE_AUDIO_CAPTURE, it->device_name,
         it->unique_id, false));
   }
 
@@ -175,7 +173,7 @@
   StreamDeviceMap::iterator it = devices_.find(session_id);
   if (it == devices_.end())
     return;
-  const content::MediaStreamDeviceType stream_type = it->second.stream_type;
+  const MediaStreamDeviceType stream_type = it->second.stream_type;
   devices_.erase(it);
 
   // Post a callback through the listener on IO thread since
@@ -194,20 +192,19 @@
   scoped_ptr<StreamDeviceInfoArray> devices_array(devices);
   if (listener_) {
     // NOTE: Only support enumeration of the MEDIA_DEVICE_AUDIO_CAPTURE type.
-    listener_->DevicesEnumerated(content::MEDIA_DEVICE_AUDIO_CAPTURE,
-                                 *devices_array);
+    listener_->DevicesEnumerated(MEDIA_DEVICE_AUDIO_CAPTURE, *devices_array);
   }
 }
 
 void AudioInputDeviceManager::OpenedOnIOThread(
-    content::MediaStreamDeviceType stream_type, int session_id) {
+    MediaStreamDeviceType stream_type, int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (listener_)
     listener_->Opened(stream_type, session_id);
 }
 
 void AudioInputDeviceManager::ClosedOnIOThread(
-    content::MediaStreamDeviceType stream_type, int session_id) {
+    MediaStreamDeviceType stream_type, int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (listener_)
     listener_->Closed(stream_type, session_id);
@@ -217,4 +214,4 @@
   return device_loop_->BelongsToCurrentThread();
 }
 
-}  // namespace media_stream
+}  // namespace content