Remove old-style constraints from Chrome internals

content/renderer/media/media_stream_audio_processor_options.h

Index: content/renderer/media/media_stream_audio_processor_options.h
diff --git a/content/renderer/media/media_stream_audio_processor_options.h b/content/renderer/media/media_stream_audio_processor_options.h
index 0d3be886ca91531add9668d0574181f86f6653c7..4807f2266171fa0ffc90268f516ad4c51cf192a6 100644
--- a/content/renderer/media/media_stream_audio_processor_options.h
+++ b/content/renderer/media/media_stream_audio_processor_options.h
@@ -13,12 +13,12 @@
 #include "content/public/common/media_stream_request.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
+#include "third_party/webrtc/media/base/mediachannel.h"
 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
 
 namespace webrtc {
 
 class EchoCancellation;
-class MediaConstraintsInterface;
 class TypingDetection;
 
 }
@@ -28,7 +28,6 @@ namespace content {
 class RTCMediaConstraints;
 
 using webrtc::AudioProcessing;
-using webrtc::MediaConstraintsInterface;
 
 // A helper class to parse audio constraints from a blink::WebMediaConstraints
 // object.
@@ -48,11 +47,11 @@ class CONTENT_EXPORT MediaAudioConstraints {
   static const char kGoogTypingNoiseDetection[];
   static const char kGoogAudioMirroring[];
 
-  // Merge |constraints| with |kDefaultAudioConstraints|. For any key which
+  // Merge |options| with |kDefaultAudioConstraints|. For any key which
   // exists in both, the value from |constraints| is maintained, including its
   // mandatory/optional status. New values from |kDefaultAudioConstraints| will
-  // be added with optional status.
-  static void ApplyFixedAudioConstraints(RTCMediaConstraints* constraints);
+  // be added.
+  static void ApplyFixedAudioConstraints(cricket::AudioOptions* options);

[tommi (sloooow) - chröme, 2016/03/14 18:37:47]

depending on a type from 'cricket' looks like a regression (new code should not
use it and we're cleaning it up elsewhere).  Is there a more appropriate type we
can use?

[hta - Chromium, 2016/03/15 06:47:33]

Not that I know of. The third_party/webrtc/api/localaudiosource.h "Create"
function (where this ends up) has two instances, one with cricket::AudioOptions
and the other with MediaConstraintsInterface - the form we're trying to get away
from.

I can add a TODO to switch to a non-cricket interface when available.

 
   // |effects| is the bitmasks telling whether certain platform
   // hardware audio effects are enabled, like hardware echo cancellation. If