Extend content::DesktopMediaID to allow Aura windows as capture sources.

content/renderer/media/media_stream_impl.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/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/public/common/desktop_media_id.h"
 #include "content/renderer/media/media_stream_audio_renderer.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_source_extra_data.h"
 #include "content/renderer/media/rtc_video_renderer.h"
 #include "content/renderer/media/webrtc_audio_capturer.h"
 #include "content/renderer/media/webrtc_audio_renderer.h"
 #include "content/renderer/media/webrtc_local_audio_renderer.h"
 #include "content/renderer/media/webrtc_logging.h"
@@ skipping 43 matching lines @@
   if (options->video_type != content::MEDIA_NO_SERVICE) {
     std::string video_stream_source = GetStreamConstraint(
         user_media_request.videoConstraints(), kMediaStreamSource, true);
     if (video_stream_source == kMediaStreamSourceTab) {
       options->video_type = content::MEDIA_TAB_VIDEO_CAPTURE;
       options->video_device_id = GetStreamConstraint(
           user_media_request.videoConstraints(),
           kMediaStreamSourceId, true);
     } else if (video_stream_source == kMediaStreamSourceScreen) {
       options->video_type = content::MEDIA_DESKTOP_VIDEO_CAPTURE;
-      options->video_device_id =
-          DesktopMediaID(DesktopMediaID::TYPE_SCREEN, 0).ToString();
+      // Set empty video device ID when screen capture is requested.
+      options->video_device_id.clear();
     } else if (video_stream_source == kMediaStreamSourceDesktop) {
       options->video_type = content::MEDIA_DESKTOP_VIDEO_CAPTURE;
       options->video_device_id = GetStreamConstraint(
           user_media_request.videoConstraints(),
           kMediaStreamSourceId, true);
     }
   }
 }
 
 static int g_next_request_id  = 0;
@@ skipping 806 matching lines @@
       enable_automatic_output_device_selection(
           enable_automatic_output_device_selection),
       frame(frame),
       request(request) {
 }
 
 MediaStreamImpl::UserMediaRequestInfo::~UserMediaRequestInfo() {
 }
 
 }  // namespace content