Reland review 34393006: Refactor MediaStreamManager to not output real device id.

content/browser/renderer_host/media/device_request_message_filter.cc

 // Copyright 2013 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/device_request_message_filter.h"
 
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/common/media/media_stream_messages.h"
-#include "content/public/browser/media_device_id.h"
 #include "content/public/browser/resource_context.h"
 
 // Clears the MediaStreamDevice.name from all devices in |device_list|.
 static void ClearDeviceLabels(content::StreamDeviceInfoArray* devices) {
   for (content::StreamDeviceInfoArray::iterator device_itr = devices->begin();
        device_itr != devices->end();
        ++device_itr) {
     device_itr->device.name.clear();
   }
 }
@@ skipping 69 matching lines @@
   }
   DCHECK(request_it != requests_.end());
 
   StreamDeviceInfoArray* audio_devices = &request_it->audio_devices;
   StreamDeviceInfoArray* video_devices = &request_it->video_devices;
 
   // Store hmac'd device ids instead of raw device ids.
   if (label == request_it->audio_devices_label) {
     request_it->has_audio_returned = true;
     DCHECK(audio_devices->empty());
-    HmacDeviceIds(request_it->origin, new_devices, audio_devices);
+    *audio_devices = new_devices;
   } else {
     DCHECK(label == request_it->video_devices_label);
     request_it->has_video_returned = true;
     DCHECK(video_devices->empty());
-    HmacDeviceIds(request_it->origin, new_devices, video_devices);
+    *video_devices = new_devices;
   }
 
   if (!request_it->has_audio_returned || !request_it->has_video_returned) {
     // Wait for the rest of the devices to complete.
     return;
   }
 
   // Query for mic and camera permissions.
   if (!resource_context_->AllowMicAccess(request_it->origin))
     ClearDeviceLabels(audio_devices);
@@ skipping 28 matching lines @@
   return handled;
 }
 
 void DeviceRequestMessageFilter::OnChannelClosing() {
   // Since the IPC channel is gone, cancel outstanding device requests.
   media_stream_manager_->CancelAllRequests(peer_pid());
 
   requests_.clear();
 }
 
-void DeviceRequestMessageFilter::HmacDeviceIds(
-    const GURL& origin,
-    const StreamDeviceInfoArray& raw_devices,
-    StreamDeviceInfoArray* devices_with_guids) {
-  DCHECK(devices_with_guids);
-
-  // Replace raw ids with hmac'd ids before returning to renderer process.
-  for (StreamDeviceInfoArray::const_iterator device_itr = raw_devices.begin();
-       device_itr != raw_devices.end();
-       ++device_itr) {
-    StreamDeviceInfo current_device_info = *device_itr;
-    current_device_info.device.id =
-        content::GetHMACForMediaDeviceID(origin, device_itr->device.id);
-    devices_with_guids->push_back(current_device_info);
-  }
-}
-
 void DeviceRequestMessageFilter::OnGetSources(int request_id,
                                               const GURL& security_origin) {
   // Make request to get audio devices.
   const std::string& audio_label = media_stream_manager_->EnumerateDevices(
       this, -1, -1, -1, MEDIA_DEVICE_AUDIO_CAPTURE, security_origin);
   DCHECK(!audio_label.empty());
 
   // Make request for video devices.
   const std::string& video_label = media_stream_manager_->EnumerateDevices(
       this, -1, -1, -1, MEDIA_DEVICE_VIDEO_CAPTURE, security_origin);
   DCHECK(!video_label.empty());
 
   requests_.push_back(DeviceRequest(
       request_id, security_origin, audio_label, video_label));
 }
 
 }  // namespace content