Revert 232766 "Refactor MediaStreamManager to never output real ..."

trunk/src/content/browser/renderer_host/media/media_stream_ui_proxy.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/media_stream_ui_proxy.h"
 
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/video/capture/fake_video_capture_device.h"
@@ skipping 175 matching lines @@
 
   MediaStreamDevices devices_to_use;
   bool accepted_audio = false;
   bool accepted_video = false;
   // Use the first capture device of the same media type in the list for the
   // fake UI.
   for (MediaStreamDevices::const_iterator it = devices_.begin();
        it != devices_.end(); ++it) {
     if (!accepted_audio &&
         IsAudioMediaType(request.audio_type) &&
-        IsAudioMediaType(it->type) &&
-        (request.requested_audio_device_id.empty() ||
-         request.requested_audio_device_id == it->id)) {
+        IsAudioMediaType(it->type)) {
       devices_to_use.push_back(*it);
       accepted_audio = true;
     } else if (!accepted_video &&
                IsVideoMediaType(request.video_type) &&
-               IsVideoMediaType(it->type) &&
-               (request.requested_video_device_id.empty() ||
-                request.requested_video_device_id == it->id)) {
+               IsVideoMediaType(it->type)) {
       devices_to_use.push_back(*it);
       accepted_video = true;
     }
   }
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&MediaStreamUIProxy::ProcessAccessRequestResponse,
                  weak_factory_.GetWeakPtr(), devices_to_use));
 }
 
 void FakeMediaStreamUIProxy::OnStarted(const base::Closure& stop_callback) {
 }
 
 }  // namespace content