Add support for echoCancellation and deviceId to MediaStreamTrack.getSettings

content/browser/renderer_host/media/media_devices_dispatcher_host.cc

Index: content/browser/renderer_host/media/media_devices_dispatcher_host.cc
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
index ece23f0c0965a3be466a6e792bc4344c93a182d3..c4f22604c9a604695f5ad6d9fc129b4b5bbebc95 100644
--- a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/bind_helpers.h"
+#include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/media/media_devices_util.h"
@@ -22,6 +23,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/media_stream_request.h"
 #include "media/audio/audio_system.h"
+#include "media/base/media_switches.h"
 #include "media/base/video_facing.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
@@ -500,15 +502,18 @@ void MediaDevicesDispatcherHost::GotAudioInputEnumeration(
   DCHECK(current_audio_input_capabilities_.empty());
   for (const auto& device_info : enumeration[MEDIA_DEVICE_TYPE_AUDIO_INPUT]) {
     ::mojom::AudioInputDeviceCapabilities capabilities(
-        device_info.device_id, media::AudioParameters());
+        device_info.device_id,
+        media::AudioParameters::UnavailableDeviceParams());
     if (device_info.device_id == default_device_id)
       current_audio_input_capabilities_.insert(
           current_audio_input_capabilities_.begin(), std::move(capabilities));
     else
       current_audio_input_capabilities_.push_back(std::move(capabilities));
   }
-  // No devices, no need to read audio parameters.
-  if (current_audio_input_capabilities_.empty()) {
+  // No devices or fake devices, no need to read audio parameters.
+  if (current_audio_input_capabilities_.empty() ||
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUseFakeDeviceForMediaStream)) {
     FinalizeGetAudioInputCapabilities();
     return;
   }
@@ -531,9 +536,9 @@ void MediaDevicesDispatcherHost::GotAudioInputParameters(
   DCHECK_GT(current_audio_input_capabilities_.size(), index);
   DCHECK_GT(num_pending_audio_input_parameters_, 0U);
 
-  current_audio_input_capabilities_[index].parameters =
-      parameters.IsValid() ? parameters
-                           : media::AudioParameters::UnavailableDeviceParams();
+  if (parameters.IsValid())
+    current_audio_input_capabilities_[index].parameters = parameters;

[hbos_chromium, 2017/07/04 15:26:48]

Can you [D]CHECK that
current_audio_input_capabilities_[index].parameters.IsValid() after this line?

[Guido Urdaneta, 2017/07/05 09:23:36]

Done.

+
   if (--num_pending_audio_input_parameters_ == 0U)
     FinalizeGetAudioInputCapabilities();
 }