Remove old-style constraints from Chrome internals

content/renderer/media/media_stream_audio_processor_options.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_
 
 #include <string>
 
 #include "base/files/file.h"
 #include "base/macros.h"
 #include "content/common/content_export.h"
 #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;
 
 }
 
 namespace content {
 
 class RTCMediaConstraints;
 
 using webrtc::AudioProcessing;
-using webrtc::MediaConstraintsInterface;
 
 // A helper class to parse audio constraints from a blink::WebMediaConstraints
 // object.
 class CONTENT_EXPORT MediaAudioConstraints {
  public:
   // Constraint keys used by audio processing.
   static const char kEchoCancellation[];
   static const char kGoogEchoCancellation[];
   static const char kGoogExperimentalEchoCancellation[];
   static const char kGoogAutoGainControl[];
   static const char kGoogExperimentalAutoGainControl[];
   static const char kGoogNoiseSuppression[];
   static const char kGoogExperimentalNoiseSuppression[];
   static const char kGoogBeamforming[];
   static const char kGoogArrayGeometry[];
   static const char kGoogHighpassFilter[];
   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
   // some hardware effect is enabled, the corresponding software audio
   // processing will be disabled.
   MediaAudioConstraints(const blink::WebMediaConstraints& constraints,
                         int effects);
   virtual ~MediaAudioConstraints();
 
   bool GetGoogAudioMirroring() const;
@@ skipping 72 matching lines @@
 
 // Returns the array geometry from the media constraints if existing and
 // otherwise that provided by the input device.
 CONTENT_EXPORT std::vector<webrtc::Point> GetArrayGeometryPreferringConstraints(
     const MediaAudioConstraints& audio_constraints,
     const MediaStreamDevice::AudioDeviceParameters& input_params);
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_