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

content/renderer/pepper/pepper_device_enumeration_event_handler.cc

Index: content/renderer/pepper/pepper_device_enumeration_event_handler.cc
===================================================================
--- content/renderer/pepper/pepper_device_enumeration_event_handler.cc	(revision 164646)
+++ content/renderer/pepper/pepper_device_enumeration_event_handler.cc	(working copy)
@@ -11,8 +11,7 @@
 
 namespace {
 
-ppapi::DeviceRefData FromStreamDeviceInfo(
-    const media_stream::StreamDeviceInfo& info) {
+ppapi::DeviceRefData FromStreamDeviceInfo(const StreamDeviceInfo& info) {
   ppapi::DeviceRefData data;
   data.id = info.device_id;
   data.name = info.name;
@@ -47,8 +46,8 @@
 void PepperDeviceEnumerationEventHandler::OnStreamGenerated(
     int request_id,
     const std::string& label,
-    const media_stream::StreamDeviceInfoArray& audio_device_array,
-    const media_stream::StreamDeviceInfoArray& video_device_array) {
+    const StreamDeviceInfoArray& audio_device_array,
+    const StreamDeviceInfoArray& video_device_array) {
 }
 
 void PepperDeviceEnumerationEventHandler::OnStreamGenerationFailed(
@@ -57,20 +56,19 @@
 
 void PepperDeviceEnumerationEventHandler::OnDevicesEnumerated(
     int request_id,
-    const media_stream::StreamDeviceInfoArray& device_array) {
+    const StreamDeviceInfoArray& device_array) {
   NotifyDevicesEnumerated(request_id, true, device_array);
 }
 
 void PepperDeviceEnumerationEventHandler::OnDevicesEnumerationFailed(
     int request_id) {
-  NotifyDevicesEnumerated(request_id, false,
-                          media_stream::StreamDeviceInfoArray());
+  NotifyDevicesEnumerated(request_id, false, StreamDeviceInfoArray());
 }
 
 void PepperDeviceEnumerationEventHandler::OnDeviceOpened(
     int request_id,
     const std::string& label,
-    const media_stream::StreamDeviceInfo& device_info) {
+    const StreamDeviceInfo& device_info) {
   NotifyDeviceOpened(request_id, true, label);
 }
 
@@ -79,8 +77,7 @@
 }
 
 // static
-media_stream::MediaStreamType
-PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
+MediaStreamType PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
     PP_DeviceType_Dev type) {
   switch (type) {
     case PP_DEVICETYPE_DEV_INVALID:
@@ -97,7 +94,7 @@
 
 // static
 PP_DeviceType_Dev PepperDeviceEnumerationEventHandler::FromMediaStreamType(
-    media_stream::MediaStreamType type) {
+    MediaStreamType type) {
   switch (type) {
     case MEDIA_NO_SERVICE:
       return PP_DEVICETYPE_DEV_INVALID;
@@ -114,7 +111,7 @@
 void PepperDeviceEnumerationEventHandler::NotifyDevicesEnumerated(
     int request_id,
     bool succeeded,
-    const media_stream::StreamDeviceInfoArray& device_array) {
+    const StreamDeviceInfoArray& device_array) {
   EnumerateCallbackMap::iterator iter = enumerate_callbacks_.find(request_id);
   if (iter == enumerate_callbacks_.end()) {
     // This might be enumerated result sent before StopEnumerateDevices is
@@ -129,7 +126,7 @@
   std::vector<ppapi::DeviceRefData> devices;
   if (succeeded) {
     devices.reserve(device_array.size());
-    for (media_stream::StreamDeviceInfoArray::const_iterator info =
+    for (StreamDeviceInfoArray::const_iterator info =
              device_array.begin(); info != device_array.end(); ++info) {
       devices.push_back(FromStreamDeviceInfo(*info));
     }